diff --git a/game/assets/jak1/subtitle/game_subtitle_en.gd b/game/assets/jak1/subtitle/game_subtitle_en.gd index eacb983183..c46d311a12 100644 --- a/game/assets/jak1/subtitle/game_subtitle_en.gd +++ b/game/assets/jak1/subtitle/game_subtitle_en.gd @@ -10,7 +10,7 @@ (156 :offscreen "SAGE" "AND MY FATHER'S FATHERS FAILED TO FIND.") (255) (260 :offscreen "SAGE" "WHO WERE THE PRECURSORS?") - (323 :offscreen "SAGE" "WHY DID THEY CREATE THE VAST MONOLITHS THAT LITTER OUR PLANET?") + (324 :offscreen "SAGE" "WHY DID THEY CREATE THE VAST MONOLITHS THAT LITTER OUR PLANET?") (451) (454 :offscreen "SAGE" "HOW DID THEY HARNESS ECO, THE LIFE ENERGY OF THE WORLD?") (578) @@ -20,14 +20,17 @@ (818 :offscreen "SAGE" "THE PLANTS HAVE ASKED THE ROCKS, BUT THE ROCKS DO NOT RECALL.") (955 :offscreen "SAGE" "EVEN THE ROCKS DO NOT RECALL...") (1064) - (1087 :offscreen "SAGE" "EVERY BONE IN MY BODY TELLS ME THAT THE ANSWERS REST ON THE SHOULDERS OF A YOUNG BOY") - (1297 :offscreen "SAGE" "OBLIVIOUS TO HIS DESTINY, UNINTERESTED IN THE SEARCH FOR TRUTH, AND REJECTING OF MY GUIDANCE!") + (1087 :offscreen "SAGE" "EVERY BONE IN MY BODY TELLS ME THAT THE ANSWERS REST") + (1197 :offscreen "SAGE" "ON THE SHOULDERS OF A YOUNG BOY") + (1297 :offscreen "SAGE" "OBLIVIOUS TO HIS DESTINY, UNINTERESTED IN THE SEARCH FOR TRUTH") + (1444 :offscreen "SAGE" "AND REJECTING OF MY GUIDANCE!") (1536) (1542 :offscreen "SAGE" "AND WHY WOULD HE WANT TO LISTEN TO OLD SAMOS THE SAGE ANYWAY?") (1677) (1683 :offscreen "SAGE" "I'M ONLY THE MASTER OF GREEN ECO, ONE OF THE WISEST MEN ON THE PLANET!") (1872) - (1955 :offscreen "SAGE" "SO IT SEEMS THE ANSWER BEGINS NOT WITH CAREFUL RESEARCH, OR SENSIBLE THINKING.") + (1955 :offscreen "SAGE" "SO IT SEEMS THE ANSWER BEGINS NOT WITH CAREFUL RESEARCH") + (2080 :offscreen "SAGE" "OR SENSIBLE THINKING.") (2141) (2145 :offscreen "SAGE" "NAY! AS WITH MANY OF FATE'S MYSTERIES") (2281 :offscreen "SAGE" "IT BEGINS WITH BUT A SMALL ACT OF DISOBEDIENCE.") @@ -37,19 +40,24 @@ ("sage-intro-sequence-d1" (137 "SAGE" "WHAT IN GREEN TARNATION DO YOU TWO WANT?") (220 "DAXTER" "WE- WE- WE WAS- THEY WAS- I'M- I WAS-") - (283 "SAGE" "DON'T TELL ME! INSTEAD OF HEEDING MY WISDOM, THE TWO OF YOU WENT MUCKING AROUND") + (283 "SAGE" "DON'T TELL ME! INSTEAD OF HEEDING MY WISDOM") + (383 "SAGE" "THE TWO OF YOU WENT MUCKING AROUND") (440 "SAGE" "IN THE ONLY PLACE THAT I TOLD YOU NOT TO GO: MISTY ISLAND!") (550 "DAXTER" "THAT'S RIGHT! AND THEN-") - (579 "SAGE" "AND, DAXTER, YOU FINALLY TOOK A MUCH-NEEDED BATH, BUT IN A BATHTUB FILLED WITH DARK ECO.") - (793 "DAXTER" "LOOK, OLD MAN, ARE YOU GONNA KEEP YAPPIN', OR YOU GONNA HELP ME OUTTA THIS MESS!?") - (920 "SAGE" "I'M GONNA KEEP YAPPIN'! BECAUSE IN MY PROFESSIONAL OPINION, THE CHANGE IS AN IMPROVEMENT.") + (579 "SAGE" "AND, DAXTER, YOU FINALLY TOOK A MUCH-NEEDED BATH") + (692 "SAGE" "BUT IN A BATHTUB FILLED WITH DARK ECO.") + (793 "DAXTER" "LOOK, OLD MAN, ARE YOU GONNA KEEP YAPPIN'") + (861 "DAXTER" "OR YOU GONNA HELP ME OUTTA THIS MESS!?") + (920 "SAGE" "I'M GONNA KEEP YAPPIN'! BECAUSE IN MY PROFESSIONAL OPINION") + (1016 "SAGE" "THE CHANGE IS AN IMPROVEMENT.") (1079 "SAGE" "AND BESIDES... I COULDN'T HELP YOU IF I WANTED TO.") (1186 "DAXTER" "WHAT!?") (1220 "SAGE" "THERE'S ONLY ONE PERSON WHO HAS STUDIED DARK ECO LONG ENOUGH") (1329 "SAGE" "TO HAVE A CHANCE AT RETURNING YOU TO YOUR PREVIOUS FORM:") (1431 "SAGE" "GOL ACHERON, THE SAGE.") (1493) - (1496 :offscreen "SAGE" "BUT HE LIVES FAR TO THE NORTH. FAR, FAR TO NORTH. NOBODY HAS SPOKEN TO HIM IN AGES.") + (1496 :offscreen "SAGE" "BUT HE LIVES FAR TO THE NORTH. FAR, FAR TO NORTH.") + (1639 :offscreen "SAGE" "NOBODY HAS SPOKEN TO HIM IN AGES.") (1718 "SAGE" "I WOULD TELEPORT YOU THERE, BUT I CAN'T DO THAT EITHER.") (1831 "SAGE" "NONE OF THE THREE SAGES THAT MAINTAIN THE OTHER TELEPORTER GATES") (1934 "SAGE" "HAVE SEEN FIT TO TURN THEIR ENDS ON FOR QUITE A WHILE!") @@ -59,7 +67,8 @@ (3 "SAGE" "THE ONLY OTHER WAY NORTH IS BY FOOT THROUGH THE FIRE CANYON") (114 :offscreen "SAGE" "BUT ITS VOLCANIC SOIL IS HOT ENOUGH TO MELT PRECURSOR METAL.") (224 "SAGE" "YOU CAN'T JUST WALK THROUGH IT.") - (270 "KEIRA" "BUT YOU COULD FLY OVER IT, IF YOU HAD A ZOOMER EQUIPPED WITH A HEAT SHIELD.") + (270 "KEIRA" "BUT YOU COULD FLY OVER IT") + (329 "KEIRA" "IF YOU HAD A ZOOMER EQUIPPED WITH A HEAT SHIELD.") (393) (396 "KEIRA" "I JUST HAPPEN TO BE WORKING ON SUCH A THING AT THIS VERY MOMENT.") (512) @@ -69,8 +78,9 @@ (699 "SAGE" "YES, KEIRA, THAT MIGHT WORK. BUT WHERE ARE A BOY") (826 :offscreen "SAGE" "AND A HALF!") (857 "SAGE" "GOING TO GET TWENTY POWER CELLS?") - (910 "KEIRA" "FROM THE VILLAGERS! MOST OF THEM HAVE A POWER CELL OR TWO STASHED AWAY SOMEWHERE.") - (1050 :offscreen "KEIRA" "AND EVEN IF THEY AREN'T WILLING TO JUST GIVE THEM AWAY") + (910 "KEIRA" "FROM THE VILLAGERS! MOST OF THEM HAVE A POWER CELL OR TWO") + (998 "KEIRA" "STASHED AWAY SOMEWHERE.") + (1049 :offscreen "KEIRA" "AND EVEN IF THEY AREN'T WILLING TO JUST GIVE THEM AWAY") (1133 "KEIRA" "GREASING THEIR PALMS WITH A FEW PRECURSOR ORBS SHOULD DO THE TRICK.") (1243) (1246 :offscreen "KEIRA" "AND I BET THERE ARE EVEN MORE OF THEM OUT IN THE WILDS JUST WAITING FOR SOME") @@ -93,7 +103,8 @@ ("sage-intro-sequence-e" (200 "SAGE" "GOOD TRAINING, BOYS, BUT THAT'S NOTHING COMPARED TO THE CHALLENGES THAT LIE AHEAD.") (359 "DAXTER" "AH, THEY'RE NO PROBLEM. WE GOT THE MOVES, EH JAK?") - (496 "DAXTER" "WE'D LOVE TO STAY AND CHAT, BIG GREEN, BUT WE'RE UH... ITCHING TO GET ON WITH OUR ADVENTURES.") + (496 "DAXTER" "WE'D LOVE TO STAY AND CHAT, BIG GREEN, BUT WE'RE UH...") + (586 "DAXTER" "ITCHING TO GET ON WITH OUR ADVENTURES.") (660 "SAGE" "FINE, FINE, \"ADVENTURE\" AWAY THEN.") (787 "SAGE" "AND WHILE YOU'RE OUT \"ADVENTURING,\" WHY DON'T YOU MAKE YOURSELF USEFUL?") (940) @@ -259,29 +270,47 @@ (75) (81 "ORACLE" "WAIT, ONE OF YOU HAS THE LIGHT WITHIN.") (198) - (206 "ORACLE" "FROM BEFORE TIME, I HAVE WATCHED AND WAITED FOR THE TRUE HERO TO RETURN.") + (206 "ORACLE" "FROM BEFORE TIME, I HAVE WATCHED AND WAITED") + (308 "ORACLE" "FOR THE TRUE HERO TO RETURN.") (390) - (395 "ORACLE" "PRESENT TO ME 120 PRECURSOR ORBS FOR EACH POWER CELL I CONTAIN.") + (395 "ORACLE" "PRESENT TO ME 120 PRECURSOR ORBS") + (500 "ORACLE" "FOR EACH POWER CELL I CONTAIN.") ) ("oracle-intro-2" - (0 "ORACLE" "BEWARE OF THE DARK LIGHT, FOR IT HAS TWISTED THE FATE OF ONE OF YOU.") + (0 "ORACLE" "BEWARE OF THE DARK LIGHT,") + (87 "ORACLE" "FOR IT HAS TWISTED THE FATE OF ONE OF YOU.") (171) - (181 "ORACLE" "BRING ME 120 PRECURSOR ORBS FOR EACH POWER CELL I CONTAIN.") + (181 "ORACLE" "BRING ME 120 PRECURSOR ORBS") + (273 "ORACLE" "FOR EACH POWER CELL I CONTAIN.") ) ("oracle-intro-3" (0 "ORACLE" "SEEK THE PURE LIGHT, FOR WITHIN ITS FLAME THE ANSWERS RESIDE.") (172) - (182 "ORACLE" "YOU CAN GAIN MY POWER CELLS BY BRINGING 120 PRECURSOR ORBS FOR EACH.") + (182 "ORACLE" "YOU CAN GAIN MY POWER CELLS") + (248 "ORACLE" "BY BRINGING 120 PRECURSOR ORBS FOR EACH.") ) ("oracle-left-eye-1" (0 "ORACLE" "YOU HAVE PROVEN YOURSELF WORTHY. HERE IS A POWER CELL.")) ("oracle-left-eye-2" (0 "ORACLE" "FOR YOUR SACRIFICE, I OFFER YOU A POWER CELL.")) ("oracle-left-eye-3" (0 "ORACLE" "FOR YOUR EFFORT, A POWER CELL IS THE REWARD.")) -("oracle-reminder-1" (0 "ORACLE" "BRING TO ME 120 PRECURSOR ORBS AND I WILL AWARD YOU A POWER CELL.")) -("oracle-reminder-2" (0 "ORACLE" "PRESENT 120 PRECURSOR ORBS, AND A POWER CELL WILL BE YOUR REWARD.")) -("oracle-reminder-3" (0 "ORACLE" "YOU MUST BRING 120 PRECURSOR ORBS TO ME FOR EACH POWER CELL I CONTAIN.")) + +("oracle-reminder-1" + (0 "ORACLE" "BRING TO ME 120 PRECURSOR ORBS") + (116 "ORACLE" "AND I WILL AWARD YOU A POWER CELL.") + ) + +("oracle-reminder-2" + (0 "ORACLE" "PRESENT 120 PRECURSOR ORBS") + (89 "ORACLE" "AND A POWER CELL WILL BE YOUR REWARD.") + ) + +("oracle-reminder-3" + (0 "ORACLE" "YOU MUST BRING 120 PRECURSOR ORBS") + (98 "ORACLE" "TO ME FOR EACH POWER CELL I CONTAIN.") + ) + ("oracle-right-eye-1" (0 "ORACLE" "FOR YOUR GIFT, ANOTHER POWER CELL IS YOURS.")) ("oracle-right-eye-2" (0 "ORACLE" "HERE IS ANOTHER POWER CELL FOR YOUR QUEST.")) ("oracle-right-eye-3" (0 "ORACLE" "YOU HAVE OBTAINED ANOTHER POWER CELL.")) @@ -317,17 +346,21 @@ ("asstvb45" :hint #x904 (0 "KEIRA" "WOW! THAT LAST SCOUT FLY HAD A POWER CELL!") - (219 "KEIRA" "I'LL BET IF YOU COLLECT ALL 7 IN EACH AREA YOU CAN FIND EVEN MORE POWER CELLS.") + (219 "KEIRA" "I'LL BET IF YOU COLLECT ALL 7 IN EACH AREA") + (387 "KEIRA" "YOU CAN FIND EVEN MORE POWER CELLS.") ) ("asstvb46" :hint #x905 - (0 "KEIRA" "BE CAREFUL IN THE OCEAN, THE WATERS ARE CHOCK-FULL OF LURKER SHARKS") - (258 "KEIRA" "AND I'VE NEVER SEEN ANYONE DEFEAT ONE.") + (0 "KEIRA" "BE CAREFUL IN THE OCEAN, THE WATERS ARE CHOCK-FULL OF") + (188 "KEIRA" "LURKER SHARKS AND I'VE NEVER SEEN ANYONE DEFEAT ONE.") (419) (426 "KEIRA" "STAY CLEAR OF THEM IF YOU KNOW WHAT'S GOOD FOR YOU!") ) -("asstvb47" :hint #x906 (0 "KEIRA" "REMEMBER, THAT'S A POWER CELL. YOU NEED TO COLLECT AS MANY OF THOSE AS YOU CAN.")) +("asstvb47" :hint #x906 + (0 "KEIRA" "REMEMBER, THAT'S A POWER CELL.") + (140 "KEIRA" "YOU NEED TO COLLECT AS MANY OF THOSE AS YOU CAN.") + ) ("asstvb48" :hint #x907 (0 "KEIRA" "THAT'S A BLUE ECO VENT! MORE CONCENTRATED THAN THE FLOATING CLUSTERS,") @@ -379,8 +412,8 @@ ("sagevb37" :hint #x918 (0 "SAGE" "WHEN YOU GET SOME CONFIDENCE, TRY USING SOME OF YOUR MOVES IN COMBINATIONS.")) ("sagevb38" :hint #x919 - (0 "SAGE" "YOU CAN'T COME BACK THROUGH THE WARP GATE UNTIL YOU FIND") - (168 "SAGE" "ALL 4 POWER CELLS ON THIS ISLAND.") + (0 "SAGE" "YOU CAN'T COME BACK THROUGH THE WARP GATE") + (120 "SAGE" "UNTIL YOU FIND ALL 4 POWER CELLS ON THIS ISLAND.") ) ("sagevb39" :hint #x91a @@ -428,7 +461,10 @@ (295) ) -("assistant-reminder-1-generic" (25 "KEIRA" "HEY GUYS! KEEP COLLECTING POWER CELLS, THEY'RE THE KEY TO CONTINUING OUR JOURNEY NORTH.")) +("assistant-reminder-1-generic" + (25 "KEIRA" "HEY GUYS! KEEP COLLECTING POWER CELLS") + (98 "KEIRA" "THEY'RE THE KEY TO CONTINUING OUR JOURNEY NORTH.") + ) ("assistant-reminder-1-race-bike" (19 "KEIRA" "I'VE DEFINITELY FIGURED OUT HOW TO USE THE TRANS-PADS.") @@ -437,16 +473,19 @@ ) ("explorer-introduction" - (23 "JAK'S UNCLE" "WELL, HELLO THERE MY DEAR BOY. YOU'VE CAUGHT AT A MOST INOPPORTUNE MOMENT.") + (23 "JAK'S UNCLE" "WELL, HELLO THERE MY DEAR BOY.") + (112 "JAK'S UNCLE" "YOU'VE CAUGHT AT A MOST INOPPORTUNE MOMENT.") (197 "JAK'S UNCLE" "I WAS TO SET OFF ON MY JOURNEYS YESTERDAY") (288 "JAK'S UNCLE" "BUT I SEEM TO BE A SPOT SHORT ON THE OLD PRECURSOR ORBS.") (426) (430 "JAK'S UNCLE" "I WOULD'VE PLEDGED MY WORD THAT I HAD 90 OF THEM,") - (538 "JAK'S UNCLE" "BUT I GATHER THAT YOUR YOUNG FRIEND, YOU KNOW, THE LITTLE ANNOYING MISERABLY UGLY ONE") - (716 "JAK'S UNCLE" "MIGHT HAVE JUST PILFERED THEM AS A SORT OF A SPOT OF FUN.") + (538 "JAK'S UNCLE" "BUT I GATHER THAT YOUR YOUNG FRIEND, YOU KNOW, THE") + (626 "JAK'S UNCLE" "LITTLE ANNOYING MISERABLY UGLY ONE") + (715 "JAK'S UNCLE" "MIGHT HAVE JUST PILFERED THEM AS A SORT OF A SPOT OF FUN.") (829) - (865 "JAK'S UNCLE" "ANYWAY, WOULD YOU BE KIND ENOUGH TO LOAN YOUR DEAR OLD UNCLE 90 PRECURSOR ORBS") - (1043 "JAK'S UNCLE" "SO HE CAN GET UNDERWAY? I WOULD OFFER YOU A POWER CELL IN RETURN.") + (865 "JAK'S UNCLE" "ANYWAY, WOULD YOU BE KIND ENOUGH TO LOAN YOUR DEAR OLD UNCLE") + (985 "JAK'S UNCLE" "90 PRECURSOR ORBS SO HE CAN GET UNDERWAY?") + (1098 "JAK'S UNCLE" "I WOULD OFFER YOU A POWER CELL IN RETURN.") ) ("explorer-reminder-1" @@ -465,18 +504,24 @@ (28 "JAK'S UNCLE" "I SEE YOU TWO ARE BACK TO MAKE THE TRADE. GOOD, GOOD, JOLLY GOOD!") (179 "JAK'S UNCLE" "EH, YOU HAVE THE UH, PRECURSOR ORBS THAT WE AGREED ON?") (310) - (324 "JAK'S UNCLE" "I HOPE YOU PUT THIS HARD-EARNED POWER CELL TO GOOD USE. CHEERIO, TA TA, BYE BYE!") + (324 "JAK'S UNCLE" "I HOPE YOU PUT THIS HARD-EARNED POWER CELL TO GOOD USE.") + (453 "JAK'S UNCLE" "CHEERIO, TA TA, BYE BYE!") ) ("farmer-introduction" (1 "FARMER" "GOTTA MILK THOSE YAKOWS, GOTTA MILK THOSE YAKOWS...") - (113 "FARMER" "OH! IT'S YOU... JUST RESTIN' MY TIRED BONES. I'VE BEEN TRYING TO GET THOSE ORNERY YAKOWS") - (317 "FARMER" "BACK INTO THE PEN ALL DAY! SOME STRANGE CREATURES TRIED TO STEAL 'EM EARLIER.") + (113 "FARMER" "OH! IT'S YOU... JUST RESTIN' MY TIRED BONES.") + (257 "FARMER" "I'VE BEEN TRYING TO GET THOSE ORNERY YAKOWS") + (317 "FARMER" "BACK INTO THE PEN ALL DAY!") + (372 "FARMER" "SOME STRANGE CREATURES TRIED TO STEAL 'EM EARLIER.") (454) (456 "FARMER" "YOU THINK YOU CAN HELP AN OLD MAN TRY TO GET 'EM BACK INTO THE CORRAL?") ) -("farmer-reminder-1" (0 "FARMER" "HEY! MY YAKOWS ARE STILL ON THE LOOSE! EH, COULD YOU BRING 'EM BACK FOR ME ALREADY?")) +("farmer-reminder-1" + (0 "FARMER" "HEY! MY YAKOWS ARE STILL ON THE LOOSE!") + (96 "FARMER" "EH, COULD YOU BRING 'EM BACK FOR ME ALREADY?") + ) ("farmer-reminder-2" (0 "FARMER" "THOSE DARN YAKOWS ARE STILL ROAMIN' FREE.") @@ -546,14 +591,30 @@ ("ASSTLP03" :hint #x0 (0 "KEIRA" "WE NEED POWER CELLS TO FUEL THE HEAT SHIELD...")) ("ASSTLP04" :hint #x0 (0 "KEIRA" "WHERE'S MY SPANNER?")) ("ASSTLP05" :hint #x0 (0 "KEIRA" "FIRE CANYON IS SO HOT...")) -("EXP-AM01" :hint #x0 (0 "JAK'S UNCLE" "I NEED TO SET OFF ON MY JOURNEY SOON. I NEED PRECURSOR ORBS!")) + +("EXP-AM01" :hint #x0 + (0 "JAK'S UNCLE" "I NEED TO SET OFF ON MY JOURNEY SOON.") + (140 "JAK'S UNCLE" "I NEED PRECURSOR ORBS!") + ) + ("EXP-AM02" :hint #x0 (0 "JAK'S UNCLE" "LET'S SEE, NOW WHERE SHALL I GO FIRST? EH...")) ("EXP-AM03" :hint #x0 (0 "JAK'S UNCLE" "OH I DO MISS THE OPEN ROAD.")) ("EXP-AM04" :hint #x0 (0 "JAK'S UNCLE" "SO MANY PLACES TO SEE, AND SO LITTLE TIME.")) -("EXP-AM05" :hint #x0 (0 "JAK'S UNCLE" "WELL IN MY DAY, YOU COULD WALK THE LANDS WITHOUT BEING ASSAULTED BY MONSTERS!")) + +("EXP-AM05" :hint #x0 + (0 "JAK'S UNCLE" "WELL IN MY DAY, YOU COULD WALK THE LANDS") + (185 "JAK'S UNCLE" "WITHOUT BEING ASSAULTED BY MONSTERS!") + ) + ("EXP-LO02" :hint #x0 (0 "JAK'S UNCLE" "I NEED MORE PRECURSOR ORBS.")) ("EXP-LO1A" :hint #x0 (0 "JAK'S UNCLE" "(MUTTERS)")) -("FAR-AM01" :hint #x0 (0 "FARMER" "(SNORES) HERE, BESSIE... HERE, BESSIE BESSIE... THAT'S A GOOD GIRL...")) + +("FAR-AM01" :hint #x0 + (0 "FARMER" "(SNORES) HERE, BESSIE... HERE, BESSIE BESSIE...") + (395 "FARMER" "THAT'S A GOOD GIRL...") + (500) + ) + ("FAR-AM02" :hint #x0 (0 "FARMER" "GOTTA BRING IN THE CROPS 'FORE THE JUNE BUGS...")) ("FAR-AM2A" :hint #x0 (0 "FARMER" "GOTTA BRING IN THE CROPS 'FORE THE JUNE BUGS GET...")) ("FAR-LO01" :hint #x0 (0 "FARMER" "(SNORES)")) @@ -565,7 +626,12 @@ (221 "SAGE" "I DON'T CARE WHAT THE OTHERS SAY.") ) -("SAGELP05" :hint #x0 (0 "SAGE" "HELLO, BLUE SAGE? HELLO? WHERE IN THE BLUE BLAZES COULD HE BE...")) +("SAGELP05" :hint #x0 + (0 "SAGE" "HELLO, BLUE SAGE? HELLO?") + (210) + (240 "SAGE" "WHERE IN THE BLUE BLAZES COULD HE BE...") + ) + ("SAGELP06" :hint #x0 (0 "SAGE" "MY, MY, MY...")) ("SAGELP11" :hint #x0 (0 "SAGE" "ANYONE? ANYONE AT ALL? COME IN?")) ("sksp0010" :hint #x231 (0 "DAXTER" "HEY! LET'S GO CHECK OUT OL' FISH BREATH'S SPEED-BOAT AT THE DOCK!")) @@ -593,6 +659,7 @@ (0 "KEIRA" "YOU DON'T HAVE ENOUGH POWER CELLS TO FUEL MY HEAT SHIELD.") (216) (234 "KEIRA" "YOU CAN'T CROSS FIRE CANYON UNTIL YOU COLLECT ENOUGH POWER CELLS.") + (500) ) ("sksp018a" :hint #x297 @@ -602,12 +669,15 @@ ("asstvb04" :hint #x2b1 (0 "KEIRA" "GOOD, YOU'VE COLLECTED ENOUGH POWER CELLS TO FUEL MY HEAT SHIELD!") - (233 "KEIRA" "MEET ME BY THE ENTRANCE TO THE FIRE CANYON BY CLIMBING THE CLIFF BEHIND THE FARMER'S HOUSE.") - (559 "KEIRA" "BRING THE POWER CELLS, AND HURRY! MY FATHER SAYS HE'S SEEN MORE LURKERS AROUND!") + (220 "KEIRA" "MEET ME BY THE ENTRANCE TO THE FIRE CANYON") + (360 "KEIRA" "BY CLIMBING THE CLIFF BEHIND THE FARMER'S HOUSE.") + (555 "KEIRA" "BRING THE POWER CELLS, AND HURRY!") + (690 "KEIRA" "MY FATHER SAYS HE'S SEEN MORE LURKERS AROUND!") ) ("asstvb08" :hint #x2b2 - (0 "KEIRA" "HURRY UP WITH THOSE POWER CELLS. I'M WAITING AT THE HEAD OF FIRE CANYON") + (20 "KEIRA" "HURRY UP WITH THOSE POWER CELLS.") + (140 "KEIRA" "I'M WAITING AT THE HEAD OF FIRE CANYON") (260 "KEIRA" "AT THE TOP OF THE CLIFF BEHIND THE FARMER'S HOUSE!") ) @@ -616,10 +686,12 @@ ;; ----------------- ("bird-lady-beach-resolution" - (30 "BIRDWATCHER" "OH MY, I HOPE THE POOR DEAR'S OKAY. HERE'S A POWER CELL FOR YOUR VALOR.") - (243) + (30 "BIRDWATCHER" "OH MY, I HOPE THE POOR DEAR'S OKAY.") + (148) + (157 "BIRDWATCHER" "HERE'S A POWER CELL FOR YOUR VALOR.") + (237) (306 "FLUT FLUT" "MAMA!") - (354) + (351) (406 "FLUT FLUT" "MAMA!") (430 "DAXTER" "OH NO! NO, NO, NO, NO!") (533) @@ -638,14 +710,18 @@ (245) (251 "DAXTER" "HUH! YOU DON'T LOOK SO GOOD YOURSELF, LADY!") (328) - (331 "BIRDWATCHER" "OH, SORRY. I THOUGHT YOU WERE A SPOTTED ORANGE-BELLIED RAIN FRAY.") - (451) - (454 "BIRDWATCHER" "YOU KNOW, YESTERDAY I SAW SOME TERRIBLY VICIOUS CREATURES") - (578 "BIRDWATCHER" "CAPTURE A MOTHER FLUT FLUT NEAR THE BEACH.") + (331 "BIRDWATCHER" "OH, SORRY. I THOUGHT YOU WERE A SPOTTED") + (408 "BIRDWATCHER" "ORANGE-BELLIED RAIN FRAY.") + (454) + (457 "BIRDWATCHER" "YOU KNOW, YESTERDAY I SAW SOME") + (536 "BIRDWATCHER" "TERRIBLY VICIOUS CREATURES CAPTURE") + (590 "BIRDWATCHER" "A MOTHER FLUT FLUT NEAR THE BEACH.") (648) - (654 :offscreen "BIRDWATCHER" "NOW THERE'S THIS POOR LITTLE ORPHAN EGG SITTING IN A NEST AT THE TOP OF THE CLIFF") - (796 :offscreen "BIRDWATCHER" "AND I CAN'T GET TO IT. IF YOU COULD CLIMB UP THERE AND PUSH IT OFF, I'VE PILED") - (945 :offscreen "BIRDWATCHER" "SOME HAY DOWN AT THE BASE TO CATCH IT SAFELY.") + (654 :offscreen "BIRDWATCHER" "NOW THERE'S THIS POOR LITTLE ORPHAN EGG") + (730 :offscreen "BIRDWATCHER" "SITTING IN A NEST AT THE TOP OF THE CLIFF") + (794 :offscreen "BIRDWATCHER" "AND I CAN'T GET TO IT.") + (854 :offscreen "BIRDWATCHER" "IF YOU COULD CLIMB UP THERE AND PUSH IT OFF, I'VE PILED") + (946 :offscreen "BIRDWATCHER" "SOME HAY DOWN AT THE BASE TO CATCH IT SAFELY.") (1041) (1044 "BIRDWATCHER" "DO AN OLD LADY A FAVOR, AND I'LL GIVE YOU A POWER CELL.") (1198) @@ -661,9 +737,11 @@ ("bird-lady-reminder-2" (58 "BIRDWATCHER" "ARE YOU BOYS STILL PICKING AROUND HERE? HO HO HO.") (170) - (174 "BIRDWATCHER" "I'LL BET THAT POOR LITTLE BLUE EGG ON THE CLIFF IS GETTING AWFULLY COLD BY NOW.") + (174 "BIRDWATCHER" "I'LL BET THAT POOR LITTLE BLUE EGG ON THE CLIFF") + (244 "BIRDWATCHER" "IS GETTING AWFULLY COLD BY NOW.") (313) - (316 "BIRDWATCHER" "GO SAVE IT BY PUSHING IT OFF THE EDGE OF THE CLIFF, AND I'LL GIVE YOU A POWER CELL.") + (316 "BIRDWATCHER" "GO SAVE IT BY PUSHING IT OFF THE EDGE OF THE CLIFF,") + (405 "BIRDWATCHER" "AND I'LL GIVE YOU A POWER CELL.") ) ("mayor-introduction" @@ -783,12 +861,19 @@ ) ("CHI-AM03" :hint #x0 - (0 "MAYOR" "...FIRST THE FISHERMAN'S BOAT, (STUTTERS) IT'S ATTACKED BY A MONSTER...") - (352) - (395 "MAYOR" "AND NOW, NOW THIS... WHAT ELSE COULD GO WRONG?") + (80 "MAYOR" "F-FIRST THE FISHERMAN'S BOAT IS...") + (230 "MAYOR" "IT'S ATTACKED BY A MONSTER...") + (350) + (390 "MAYOR" "AND NOW, NOW THIS...") + (540) + (570 "MAYOR" "WHAT ELSE COULD GO WRONG?") + ) + +("CHI-AM04" :hint #x0 + (0 "MAYOR" "I DON'T... I'D, I'D... OOH, MAYBE I SHOULD RAISE TAXES...") + (450 "MAYOR" "TO PAY FOR THIS MESS.") ) -("CHI-AM04" :hint #x0 (0 "MAYOR" "I DON'T... I'D, I'D... OOH, MAYBE I SHOULD RAISE TAXES (STUTTERS) TO PAY FOR THIS MESS.")) ("CHI-AM05" :hint #x0 (0 "MAYOR" "PROBLEMS... PROBLEMS... PROBLEMS!")) ("CHI-AM06" :hint #x0 (0 "MAYOR" "(SOBS) I'LL NEVER GET RE-ELECTED NOW...")) ("CHI-AM07" :hint #x0 (0 "MAYOR" "(MOANS) WHAT'S HAPPENED TO THE VILLAGE'S ENERGY BEAM?")) @@ -844,19 +929,23 @@ ;; ----------------- ("fisher-accept" - (0 :offscreen "FISHERMAN" "THERE ARE TWO TYPES OF GOOD FISH TO CATCH: ONE-POUND FISHIES, AND FIVE-POUND FISHIES.") - (220 :offscreen "FISHERMAN" "HEH. IF YOU MISS 20 POUNDS OF GOOD FISH, THEN I'M GONNA TAKE ME NET BACK FROM YA!") + (0 :offscreen "FISHERMAN" "THERE ARE TWO TYPES OF GOOD FISH TO CATCH:") + (83 :offscreen "FISHERMAN" "ONE-POUND FISHIES, AND FIVE-POUND FISHIES.") + (220 :offscreen "FISHERMAN" "HEH. IF YOU MISS 20 POUNDS OF GOOD FISH") + (322 :offscreen "FISHERMAN" "THEN I'M GONNA TAKE ME NET BACK FROM YA!") (432) (438 :offscreen "FISHERMAN" "THERE ARE POISONOUS EELS IN THIS RIVER.") (542) - (545 :offscreen "FISHERMAN" "CATCH EVEN ONE OF THEM BOOGERS, AND YOU'LL POISON THE WHOLE DARN CATCH!") + (545 :offscreen "FISHERMAN" "CATCH EVEN ONE OF THEM BOOGERS") + (642 :offscreen "FISHERMAN" "AND YOU'LL POISON THE WHOLE DARN CATCH!") ) ("fisher-introduction" (0 "DAXTER" "WHAT DO YOU HAVE IN THE BASKET?") (47 "FISHERMAN" "NOTHING TO TALK ABOUT.") (100) - (103 "FISHERMAN" "THEM MONSTERS PATROLIN' THE OCEAN TOOK A BITE OUT OF ME FISHIN' RIG.") + (103 "FISHERMAN" "THEM MONSTERS PATROLIN' THE OCEAN") + (169 "FISHERMAN" "TOOK A BITE OUT OF ME FISHIN' RIG.") (226) (229 "FISHERMAN" "AND NOW THEY'RE GOBLIN' UP ME CATCH!") (290) @@ -864,16 +953,24 @@ (419) (425 "DAXTER" "WHOO! MAYBE... IT'S YOUR BREATH.") (515) - (521 "FISHERMAN" "YOU THINK YOU CAN DO BETTER? TRY SCOOPIN' UP RIVER FISH WITH A TINY NET!") + (521 "FISHERMAN" "YOU THINK YOU CAN DO BETTER?") + (569) + (572 "FISHERMAN" "TRY SCOOPIN' UP RIVER FISH WITH A TINY NET!") (665) - (671 "FISHERMAN" "I'LL GIVE YOU A POWER CELL IF YOU CAN CATCH 200 POUNDS OF THEM CRITTERS!") + (671 "FISHERMAN" "I'LL GIVE YOU A POWER CELL") + (719 "FISHERMAN" "IF YOU CAN CATCH 200 POUNDS OF THEM CRITTERS!") (808) - (814 "FISHERMAN" "AND I'LL LET YOU AND SHRIMP HERE USE MY SPEEDBOAT TO GET TO MISTY ISLAND.") + (814 "FISHERMAN" "AND I'LL LET YOU AND SHRIMP HERE") + (864 "FISHERMAN" "USE MY SPEEDBOAT TO GET TO MISTY ISLAND.") (955) (961 "FISHERMAN" "YOU'S WANT TO TRY THE CHALLENGE?") ) -("fisher-reject" (2 "FISHERMAN" "WELL, IF YOU WANT TO TRY FOR THE POWER CELL SOMETIME, YOU KNOW WHERE TO FIND ME.")) +("fisher-reject" + (2 "FISHERMAN" "WELL, IF YOU WANT TO TRY FOR THE POWER CELL SOMETIME") + (102 "FISHERMAN" "YOU KNOW WHERE TO FIND ME.") + ) + ("fisher-reminder-1" (6 "FISHERMAN" "WANT TO TRY AND BEAT THE RIVER, DO YA?")) ("fisher-resolution" @@ -881,12 +978,20 @@ (115) (120 "FISHERMAN" "NOT BAD FOR A COUPLE OF LAND LUBBERS!") (185) - (199 "FISHERMAN" "HERE'S THE POWER CELL I PROMISED, AND YOU CAN USE MY BOAT IN THE VILLAGE DOCK") + (199 "FISHERMAN" "HERE'S THE POWER CELL I PROMISED") + (277 "FISHERMAN" "AND YOU CAN USE MY BOAT IN THE VILLAGE DOCK") (351 "FISHERMAN" "WHENEVER YOU LIKE!") ) -("FIS-AM01" :hint #x0 (0 "FISHERMAN" "GRR, THESE DARN FISH... I NEVER CATCH ME A SINGLE ONE.")) -("FIS-AM02" :hint #x0 (0 "FISHERMAN" "THEM MONSTERS THAT DONE BIT ME SHIP WILL DRIVE ME BROKE.")) +("FIS-AM01" :hint #x0 + (0 "FISHERMAN" "GRR, THESE DARN FISH...") + (180 "FISHERMAN" "I NEVER CATCH ME A SINGLE ONE.") + ) + +("FIS-AM02" :hint #x0 + (0 "FISHERMAN" "THEM MONSTERS THAT DONE BIT ME SHIP") + (115 "FISHERMAN" "WILL DRIVE ME BROKE.") + ) ("FIS-AM03" :hint #x0 (0 "FISHERMAN" "DRAT, THESE BLIGHTERS!") @@ -953,14 +1058,18 @@ (220 "DAXTER" "LET'S GO FIDDLE WITH THEM!") ) -("sksp0b42" :hint #x278 (0 "DAXTER" "STOP MISSING THE YELLOW FISH, THEY WEIGH FIVE POUNDS EACH! AND THAT'S A LOTTA FISH, JAK.")) +("sksp0b42" :hint #x278 + (0 "DAXTER" "STOP MISSING THE YELLOW FISH, THEY WEIGH FIVE POUNDS EACH!") + (240 "DAXTER" "AND THAT'S A LOTTA FISH, JAK.") + ) ("asstvb02" :hint #x289 - (0 "KEIRA" "WOW, DID YOU SEE THAT? BLUE ECO VENTS HAVE BEEN ACTIVATED ALL OVER THE WORLD!") - (305) - (315 "KEIRA" "I KNEW THERE WAS A WAY TO TURN THEM ON.") - (435) - (442 "KEIRA" "THERE MUST BE PLACES TO TURN ON THE OTHER ECO VENTS AS WELL.") + (0 "KEIRA" "WOW, DID YOU SEE THAT?") + (110 "KEIRA" "BLUE ECO VENTS HAVE BEEN ACTIVATED ALL OVER THE WORLD!") + (300) + (310 "KEIRA" "I KNEW THERE WAS A WAY TO TURN THEM ON.") + (430) + (440 "KEIRA" "THERE MUST BE PLACES TO TURN ON THE OTHER ECO VENTS AS WELL.") ) ("sksp0049" :hint #x29c (0 "DAXTER" "LINE UP THE BEAM BY POINTING IT AT THE NEXT TOWER!")) @@ -1023,7 +1132,7 @@ ("asstvb03" :hint #x28b (0 "KEIRA" "GOOD! YOU STOPPED ALL THE MINE-DROPPING LURKERS!") (190 "KEIRA" "THEY'VE BEEN THREATENING THE WATERS AROUND OUR VILLAGE FOR WEEKS.") - (391 "KEIRA" "BRING YOUR ZOOMER BACK TO THE TRANS-PAD AND I'LL TELEPORT IT BACK.") + (370 "KEIRA" "BRING YOUR ZOOMER BACK TO THE TRANS-PAD AND I'LL TELEPORT IT BACK!") ) ("sksp0069" :hint #x2a3 (0 "DAXTER" "IT'S AN AMBUSH, JAK! IT'S AN AMBUSH!")) @@ -1040,8 +1149,8 @@ ("assistant-firecanyon-resolution" (25 "KEIRA" "GREAT! YOU HAVE THE 20 CELLS NEEDED TO POWER MY HEAT SHIELD!") (140) - (143 "KEIRA" "NOW BE CAREFUL, THE SHIELD WILL ONLY PROTECT YOUR ZOOMER TILL IT REACHES 500 DEGREES,") - (295 "KEIRA" "SO TRY TO KEEP HER COOL.") + (143 "KEIRA" "NOW BE CAREFUL, THE SHIELD WILL ONLY PROTECT YOUR ZOOMER") + (233 "KEIRA" "TILL IT REACHES 500 DEGREES, SO TRY TO KEEP HER COOL.") (343) (346 :offscreen "KEIRA" "FLYING OVER OPEN LAVA WILL DEFINITELY HEAT YOU UP FAST.") (458) @@ -1050,13 +1159,13 @@ (552 "DAXTER" "OVER?! LIKE BURNING MOLTEN METAL OVER?!") (636) (639 "KEIRA" "THE FIRE CANYON GETS PRETTY HOT, SO KEEP A LOOK OUT FOR JUMPS") - (745 "KEIRA" "TO KEEP YOU OFF THE HOT GROUND.") + (744 :offscreen "KEIRA" "TO KEEP YOU OFF THE HOT GROUND.") (792) (795 :offscreen "KEIRA" "I'VE ALSO RELEASED SEVERAL BLUE COOLING BALLOONS YOU CAN USE TO DROP") - (895 :offscreen "KEIRA" "THE SHIELD'S TEMPERATURE QUICKLY.") + (894 :offscreen "KEIRA" "THE SHIELD'S TEMPERATURE QUICKLY.") (956) (962 "KEIRA" "OH! AND WHEN YOU GET ACROSS, DON'T FORGET TO ACTIVATE") - (1063 "KEIRA" "THE TELEPORT GATE IN THE BLUE SAGE'S LAB.") + (1062 "KEIRA" "THE TELEPORT GATE IN THE BLUE SAGE'S LAB.") (1140) (1146 "KEIRA" "THEN WE'LL BE ABLE TO TELEPORT OVER AND MEET YOU!") (1222) @@ -1415,7 +1524,7 @@ (67) (73 "WARRIOR" "WONDERFUL.") (120) - (126 "WARRIOR" "YA BROUGHT ME THE PRECURSOR ORBS. (SIGHS)") + (126 "WARRIOR" "YA BROUGHT ME THE PRECURSOR ORBS.") (234) (240 "WARRIOR" "ALL RIGHT.") (279) @@ -1426,7 +1535,12 @@ ) ("ASSTLP23" :hint #x0 (0 "KEIRA" "NOW, HOW DID HE GET THAT LEVITATOR TO WORK?")) -("ASSTLP24" :hint #x0 (0 "KEIRA" "NOW, EVEN WITH POWER CELLS, WILL WE HAVE ENOUGH POWER?")) + +("ASSTLP24" :hint #x0 + (0 "KEIRA" "NOW, EVEN WITH POWER CELLS,") + (150 "KEIRA" "WILL WE HAVE ENOUGH POWER?") + ) + ("GAM-AM01" :hint #x0 (0 "GAMBLER" "HEY, TWENTY-TO-ONE ODDS AIN'T SO BAD!")) ("GAM-AM02" :hint #x0 (0 "GAMBLER" "NO, IT WAS A SURE THING!")) ("GAM-AM03" :hint #x0 (0 "GAMBLER" "HEH HEH HEH... I'M GONNA HIT THE JACKPOT NEXT TIME!")) @@ -1476,7 +1590,8 @@ ) ("asstvb21" :hint #x328 - (50 "KEIRA" "GOOD WORK! AREN'T YOU GUYS HAPPY YOU SAVED OUR LITTLE FLUT-FLUT FRIEND?") + (50 "KEIRA" "GOOD WORK! AREN'T YOU GUYS HAPPY") + (163 "KEIRA" "YOU SAVED OUR LITTLE FLUT-FLUT FRIEND?") (290 "KEIRA" "SHE MAY COME IN HANDY AGAIN SOMETIME.") (420 "KEIRA" "NOW, GO BACK TO THE TRANS-PAD, AND I'LL BRING HER HOME.") ) @@ -1533,16 +1648,21 @@ ("billy-accept" (5 "BILLY" "GOOD! THOSE RATS WILL BE BACK ANYTIME.") - (109 "BILLY" "SHOOT ALL THEM RATS, AND KEEP 'EM FROM EATING AT LEAST ONE OF THEM SNACKS.") + (109 "BILLY" "SHOOT ALL THEM RATS, AND KEEP 'EM") + (174 "BILLY" "FROM EATING AT LEAST ONE OF THEM SNACKS.") ) ("billy-introduction" (6 "BILLY" "HOWDY, FRIENDS! ENJOYIN' MY BEAUTIFUL SWAMP?") - (123 "BILLY" "I OWN THESE HERE PARTS. EVERYTHING THAT DOESN'T SINK INTO THE MUD, THAT IS! HA HA HA...") + (123 "BILLY" "I OWN THESE HERE PARTS.") + (189 "BILLY" "EVERYTHING THAT DOESN'T SINK INTO THE MUD, THAT IS! HA HA HA...") (349) - (369 "DAXTER" "JUDGING BY THE SMELL, I'D WAGER YOUR BATHTUB SANK IN THE MUD LONG AGO.") + (369 "DAXTER" "JUDGING BY THE SMELL, I'D WAGER YOUR") + (440 "DAXTER" "BATHTUB SANK IN THE MUD LONG AGO.") (497) - (519 "BILLY" "WHAT'S A BATHTUB? ANYWAY I GOT BIGGER PROBLEMS NOW...") + (519 "BILLY" "WHAT'S A BATHTUB?") + (592) + (602 "BILLY" "ANYWAY I GOT BIGGER PROBLEMS NOW...") (680) (691 "BILLY" "SEEMS SOME NASTY LURKER VARMINTS ARE GROUSIN' ABOUTS,") (798 "BILLY" "SNATCHIN' EVERYTHING THEY CAN GET THEIR GRUBBY LITTLE PAWS ON.") @@ -1550,20 +1670,27 @@ (1017) (1021 "BILLY" "HE'S BEEN MISSIN' FOR NIGH ON TO A COON'S AGE.") (1133) - (1136 :offscreen "BILLY" "I'VE BEEN PUTTIN' OUT HIS FAVORITE SNACK, BUT THOSE ORNERY SWAMP RATS KEEP STEALIN' EM!") + (1136 :offscreen "BILLY" "I'VE BEEN PUTTIN' OUT HIS FAVORITE SNACK,") + (1219 :offscreen "BILLY" "BUT THOSE ORNERY SWAMP RATS KEEP STEALIN' EM!") (1318 :offscreen "BILLY" "IF YOU COULD KEEP THOSE PESKY CRITTERS AWAY LONG ENOUGH,") (1408 :offscreen "BILLY" "I JUST KNOW FARTHY WOULD SMELL THEM VITTLES AND COME BACK!") (1519) - (1530 "BILLY" "WILL YA HELP ME OUT?") + (1534 "BILLY" "WILL YA HELP ME OUT?") ) ("billy-reject" - (7 "BILLY" "WELL, IF YOU CHANGE YOUR MIND, YOU KNOW WHERE TO FIND ME! (LAUGHS)") - (249) + (7 "BILLY" "WELL, IF YOU CHANGE YOUR MIND, YOU KNOW WHERE TO FIND ME!") + (155 "BILLY" "HE HE HE HE HEH...") + (240) ) ("billy-reminder-1" (37 "BILLY" "AHH, Y'ALL BACK TO HELP STOP THEM RATS?")) -("billy-resolution" (0 "BILLY" "WELL FRY MY HIDE! YOU SURE KNOW HOW TO SHOOT! THANKS A HEAP FOR THE HELP.")) + +("billy-resolution" + (0 "BILLY" "WELL FRY MY HIDE! YOU SURE KNOW HOW TO SHOOT!") + (116 "BILLY" "THANKS A HEAP FOR THE HELP.") + ) + ("BIL-AM01" :hint #x0 (0 "BILLY" "I JUST LOVE THE MUD.")) ("BIL-AM02" :hint #x0 (0 "BILLY" "DARN SWAMP RATS.")) ("BIL-AM03" :hint #x0 (0 "BILLY" "I NEED A GOOD DRAUGHT OF MAMA'S MEDICINE.")) @@ -1605,7 +1732,12 @@ ("sksp0142" :hint #x356 (0 "DAXTER" "THE WATER'S SAFE TO WAIT IN.")) ("sksp0143" :hint #x357 (0 "DAXTER" "WAAH! BREAK THE TONGUE'S GRIP!")) ("sksp0144" :hint #x358 (0 "DAXTER" "SHOOT THOSE RAT NESTS TO STOP THE RATS FROM COMING OUT.")) -("sksp0145" :hint #x359 (0 "DAXTER" "WOW! YOU CAN SHOOT FIREBALLS WHEN YOU'RE POWERED UP WITH YELLOW ECO.")) + +("sksp0145" :hint #x359 + (0 "DAXTER" "WOW! YOU CAN SHOOT FIREBALLS") + (113 "DAXTER" "WHEN YOU'RE POWERED UP WITH YELLOW ECO.") + ) + ("sksp0146" :hint #x35a (0 "DAXTER" "HEY! THAT'S YELLOW ECO!")) ("sksp0147" :hint #x35b (0 "DAXTER" "YOU CAN SWING ON THAT POLE OVER THERE!")) ("sksp0148" :hint #x35c (0 "DAXTER" "WATCH OUT, THAT BRAMBLE IS PRICKLY!")) @@ -1676,18 +1808,26 @@ ;; ----------------- ("asstvb23" :hint #x604 - (45 "KEIRA" "GREAT WORK! THE PEOPLE OF ROCK VILLAGE ARE BREATHING A COLLECTIVE SIGH OF RELIEF!") - (340 "KEIRA" "BUT THERE'S NO TIME TO CELEBRATE! USE YOUR ZOOMER TO NAVIGATE THE MOUNTAIN PASS UP AHEAD.") - (650 "KEIRA" "BE CAREFUL! IT LOOKS LIKE THE LURKERS HAVE RIGGED THE WHOLE PASS WITH EXPLOSIVES!") - (945 "KEIRA" "WHEN YOU REACH THE VOLCANIC CRATER, BE SURE TO VISIT THE RED SAGE'S LAB") + (45 "KEIRA" "GREAT WORK! THE PEOPLE OF ROCK VILLAGE ARE BREATHING") + (220 "KEIRA" "A COLLECTIVE SIGH OF RELIEF!") + (340 "KEIRA" "BUT THERE'S NO TIME TO CELEBRATE! USE YOUR ZOOMER") + (500 "KEIRA" "TO NAVIGATE THE MOUNTAIN PASS UP AHEAD.") + (650 "KEIRA" "BE CAREFUL, IT LOOKS LIKE THE LURKERS HAVE RIGGED") + (805 "KEIRA" "THE WHOLE PASS WITH EXPLOSIVES!") + (940 "KEIRA" "WHEN YOU REACH THE VOLCANIC CRATER,") + (1030 "KEIRA" "BE SURE TO VISIT THE RED SAGE'S LAB") (1176 "KEIRA" "AND ACTIVATE THE TELEPORT GATE SO THAT FATHER AND I CAN JOIN YOU.") (1410) ) ("asstvb24" :hint #x605 - (40 "KEIRA" "OH MY! THOSE LURKERS MUST BE HEADED FOR A DETONATOR AT THE END OF THE CANYON!") - (304 "KEIRA" "IF THEY REACH IT BEFORE YOU DO, THEY'LL BLOW UP THE ENTIRE PASS!") - (525 "KEIRA" "YOU'VE GOTTA BEAT THEM THERE AND DESTROY THE DETONATOR, OR IT'S ALL OVER!") + (30 "KEIRA" "OH MY! THOSE LURKERS MUST BE HEADED") + (180 "KEIRA" "FOR A DETONATOR AT THE END OF THE CANYON!") + (300) + (310 "KEIRA" "IF THEY REACH IT BEFORE YOU DO,") + (400 "KEIRA" "THEY'LL BLOW UP THE ENTIRE PASS!") + (525 "KEIRA" "YOU'VE GOTTA BEAT THEM THERE AND DESTROY THE DETONATOR,") + (670 "KEIRA" "OR IT'S ALL OVER!") ) ("sksp0300" :hint #x607 (0 "DAXTER" "WE HAVE TO BEAT THOSE LURKERS TO THE END OF THE PASS!")) @@ -1715,7 +1855,8 @@ ("asstvb25" :hint #x61d (10 "KEIRA" "GOOD WORK! YOU BEAT THEM TO THE DETONATOR!") - (210 "KEIRA" "THE RED SAGE'S LAB IS JUST AHEAD. GO TURN ON THE TELEPORT GATE SO WE CAN JOIN YOU.") + (210 "KEIRA" "THE RED SAGE'S LAB IS JUST AHEAD.") + (350 "KEIRA" "GO TURN ON THE TELEPORT GATE SO WE CAN JOIN YOU.") ) ;; ----------------- @@ -1863,7 +2004,8 @@ (1996 "GOL" "WE'VE LEARNED ITS SECRETS, AND NOW WE CAN RESHAPE THE WORLD TO OUR LIKING.") (2212) (2223 "SAGE" "YOU CAN'T CONTROL DARK ECO BY ITSELF! EVEN THE PRECURSORS COULDN'T-") - (2357 "MAIA" "UNTIL NOW, WE'VE HAD TO SCRAPE BY WITH WHAT LITTLE DARK ECO WE COULD FIND NEAR THE SURFACE.") + (2357 "MAIA" "UNTIL NOW, WE'VE HAD TO SCRAPE BY WITH WHAT LITTLE DARK ECO") + (2457 "MAIA" "WE COULD FIND NEAR THE SURFACE.") (2508) (2520 "MAIA" "BUT SOON, WE WILL HAVE ACCESS TO THE VAST STORES") (2611 "MAIA" "OF DARK ECO HIDDEN DEEP UNDERGROUND.") @@ -1888,13 +2030,14 @@ (3822) (3828 "SAGE" "WE MAY ALL BE DOOMED.") (3897) - (3903 "SAGE" "IF THEY OPEN THE SILOS, THE DARK ECO WILL TWIST AND DESTROY EVERYTHING IT TOUCHES!") + (3903 "SAGE" "IF THEY OPEN THE SILOS, THE DARK ECO WILL") + (3995 "SAGE" "TWIST AND DESTROY EVERYTHING IT TOUCHES!") (4080 "SAGE" "WE SIMPLY MUST GET TO THEIR CITADEL, TO STOP THEM!") (4189) (4192 "KEIRA" "THE FASTEST WAY THERE IS THROUGH THE LAVA TUBE AT THE BOTTOM OF THIS CRATER.") (4316) (4324 "KEIRA" "A FEW MORE POWER CELLS, AND YOUR ZOOMER'S HEAT SHIELD") - (4400 "KEIRA" "SHOULD GET YOU ACROSS THE LAVA SAFELY.") + (4398 "KEIRA" "SHOULD GET YOU ACROSS THE LAVA SAFELY.") (4460) (4464 "SAGE" "ALL RIGHT, MY BOY. YOU KNOW WHAT TO DO.") (4545 "SAGE" "TAKE THE FLEABAG AND GO ROUND UP MORE POWER CELLS.") @@ -1908,14 +2051,15 @@ (179) (185 "DAXTER" "GREAT. SOUNDS LIKE A REAL CHEERY PLACE.") (284) - (296 "DAXTER" "LEMME GUESS. THERE ARE SPIDERS IN THE SPIDER CAVES, RIGHT?") + (296 "DAXTER" "LET ME GUESS. THERE ARE SPIDERS IN THE SPIDER CAVES, RIGHT?") (453 "SAGE" "OF COURSE THERE ARE SPIDERS IN SPIDER CAVES!") (562) (568 "SAGE" "BUT THAT'S THE LEAST OF YOUR PROBLEMS!") (634) (637 "SAGE" "THE LURKERS ARE AFTER CRYSTALS OF CONCENTRATED DARK ECO.") (752) - (761 "SAGE" "YOU'VE GOT TO DESTROY THE CRYSTALS BEFORE THOSE MONSTERS GET THEIR HANDS ON THEM!") + (761 "SAGE" "YOU'VE GOT TO DESTROY THE CRYSTALS BEFORE THOSE MONSTERS") + (855 "SAGE" "GET THEIR HANDS ON THEM!") (896) (907 "SAGE" "HOP TO IT!") (950) @@ -1949,7 +2093,12 @@ ("ASSTLP33" :hint #x0 (0 "KEIRA" "AH-HA!")) ("ASSTLP34" :hint #x0 (0 "KEIRA" "HUH... WHAT ARE GOL AND MAIA UP TO?")) ("ASSTLP35" :hint #x0 (0 "KEIRA" "HMM... WE'VE GOTTA GET TO PRECURSOR CITY.")) -("ASSTLP36" :hint #x0 (0 "KEIRA" "HUH. THE HEAT SHIELD'S GOING TO NEED EVEN MORE POWER TO WITHSTAND THE LAVA.")) + +("ASSTLP36" :hint #x0 + (0 "KEIRA" "HUH. THE HEAT SHIELD'S GOING TO NEED EVEN MORE POWER") + (200 "KEIRA" "TO WITHSTAND THE LAVA.") + ) + ("ASSTLP37" :hint #x0 (0 "KEIRA" "AW... WE'VE GOT TO SAVE THE OTHER SAGES...")) ("MIN-LO01" :hint #x0 @@ -1979,18 +2128,23 @@ (220 "GORDY" "WHAT YOU NEED IS A SHARPER WIT!") ) -("MSH-AM01" :hint #x0 (0 "GORDY" "(LAUGHS) I'M GONNA BE RICH!")) +("MSH-AM01" :hint #x0 (0 "GORDY" "WAH-HA-HA-HA-HA! I'M GONNA BE RICH!")) ("MSH-AM02" :hint #x0 (0 "GORDY" "DIG, DIG, DIG!")) ("MSH-AM03" :hint #x0 (0 "GORDY" "WILLARD! WORK HARDER, NOT SMARTER!")) -("MSH-AM04" :hint #x0 (0 "GORDY" "(LAUGHS) I'LL BE THE RICHEST MAN IN THE WORLD! (LAUGHS)")) +("MSH-AM04" :hint #x0 (0 "GORDY" "AH-HAH, I'LL BE THE RICHEST MAN IN THE WORLD! AH HA HA...")) ("MSH-AM05" :hint #x0 (0 "GORDY" "OH HO HO! NOBODY'S EVEN SEEN A GEM THIS SIZE! AH HA HA!")) ("MSH-AM06" :hint #x0 (0 "GORDY" "EASY STREET, HERE I COME!")) ("MSH-AM07" :hint #x0 (0 "GORDY" "MY GEMS! ALL MY GEMS!")) ("MSH-AM08" :hint #x0 (0)) -("MSH-AM09" :hint #x0 (0 "GORDY" "(CHUCKLING) I CAN'T WAIT TO CASH THIS BABY IN! (LAUGHS)")) -("MSH-AM10" :hint #x0 (0 "GORDY" "THIS LOOKS LIKE A RARE CRYSTITE ZLARCONIA! (GIGGLES)")) +("MSH-AM09" :hint #x0 (0 "GORDY" "(CHUCKLING) I CAN'T WAIT TO CASH THIS BABY IN!")) +("MSH-AM10" :hint #x0 (0 "GORDY" "THIS LOOKS LIKE A RARE CRYSTITE ZLARCONIA! OH-HO-HO!")) ("MSH-AM11" :hint #x0 (0 "GORDY" "NOW WAIT A MINUTE! THEY'RE ALL MINE! MINE, I TELL YA!")) -("MSH-AM12" :hint #x0 (0 "GORDY" "SO, WILLARD. WHAT ARE YOU GONNA DO WITH YOUR QUARTER, OF YOUR HALF?")) + +("MSH-AM12" :hint #x0 + (0 "GORDY" "SO, WILLARD. WHAT ARE YOU GONNA DO WITH") + (150 "GORDY" "YOUR QUARTER, OF YOUR HALF?") + ) + ("MSH-AM1A" :hint #x0 (0 "GORDY" "I'M GONNA BE RICH!")) ("MSH-AM2A" :hint #x0 (0 "GORDY" "DIG, DIG, DIG!")) ("MSH-AM3A" :hint #x0 (0 "GORDY" "WORK HARDER, NOT SMARTER!")) @@ -2013,8 +2167,9 @@ ("SAGELP38" :hint #x0 (0 "SAGE" "COULD HE ACTUALLY HAVE...?")) ("asstva73" :hint #x427 - (0 "KEIRA" "HEY GUYS! BY MY CALCULATIONS, IT'S GOING TO TAKE 72 POWER CELLS TO FUEL THE HEAT SHIELD") - (340 "KEIRA" "AGAINST THE LAVA ON THE WAY TO GOL AND MAIA'S CITADEL.") + (0 "KEIRA" "HEY GUYS! BY MY CALCULATIONS, IT'S GOING TO TAKE") + (170 "KEIRA" "72 POWER CELLS TO FUEL THE HEAT SHIELD") + (330 "KEIRA" "AGAINST THE LAVA ON THE WAY TO GOL AND MAIA'S CITADEL.") ) ("asstva74" :hint #x428 @@ -2036,11 +2191,13 @@ ("asstv100" :hint #x44f (0 "KEIRA" "OKAY, YOU HAVE ENOUGH CELLS TO INCREASE THE POWER ON THE HEAT SHIELD.") (220 "KEIRA" "RIDE THE WOODEN MINECART DOWN THE SHAFT BY THE LAVA GEYSER.") - (420 "KEIRA" "I'LL MEET YOU BY THE ENTRANCE TO THE LAVA TUBE, SO I CAN MODIFY THE ZOOMER. HURRY!") + (420 "KEIRA" "I'LL MEET YOU BY THE ENTRANCE TO THE LAVA TUBE,") + (550 "KEIRA" "SO I CAN MODIFY THE ZOOMER. HURRY!") ) ("asstv101" :hint #x450 - (0 "KEIRA" "HAHA, OKAY! YOU HAVE ENOUGH CELLS TO INCREASE THE POWER ON THE HEAT SHIELD.") + (0 "KEIRA" "HAHA, OKAY! YOU HAVE ENOUGH CELLS TO INCREASE") + (160 "KEIRA" "THE POWER ON THE HEAT SHIELD.") (260 "KEIRA" "MEET ME BACK IN THE VOLCANIC CRATER.") (390 "KEIRA" "I'LL BE WAITING BY THE LAVA TUBE DOWN THE SHAFT BY THE LAVA GEYSER.") (610 "KEIRA" "BRING ME THE POWER CELLS!") @@ -2182,14 +2339,16 @@ (63 "BLUE SAGE" "GOOD WORK, FELLOWS! OLD SAMOS WAS RIGHT ABOUT YOU!") (162) (165 "BLUE SAGE" "GREAT PILES OF PRECURSOR METAL!") - (253 "BLUE SAGE" "THAT INSIDIOUS MECHANICAL CREATION MUST NOT BE ALLOWED TO WREAK ITS TERRIBLE HAVOC!") + (253 "BLUE SAGE" "THAT INSIDIOUS MECHANICAL CREATION") + (323 "BLUE SAGE" "MUST NOT BE ALLOWED TO WREAK ITS TERRIBLE HAVOC!") (420) - (430 "BLUE SAGE" "I WILL TRY TO ACTUATE THE SHIELD DOOR BY ELICITING A CONDUIT OF ENERGY") + (430 "BLUE SAGE" "I WILL TRY TO ACTUATE THE SHIELD DOOR") + (505 :offscreen "BLUE SAGE" "BY ELICITING A CONDUIT OF ENERGY") (563 "BLUE SAGE" "BETWEEN MYSELF AND THE VAST PORTAL BELOW!") (666) - (669 "DAXTER" "UH... YEAH. YOU DO THAT. WE'LL UH... JUST GO FIND MORE HELP.") + (672 "DAXTER" "UH... YEAH. YOU DO THAT. WE'LL UH... JUST GO FIND MORE HELP.") (879) - (891 :offscreen "DAXTER" "WEIRDO!") + (894 :offscreen "DAXTER" "WEIRDO!") (980) ) @@ -2205,13 +2364,16 @@ (816 :offscreen "SAGE" "THEN THEY ADDED A FEW DIABOLICAL ADDITIONS OF THEIR OWN,") (926 :offscreen "SAGE" "CREATING THE ONE THING CAPABLE OF OPENING THE DARK ECO SILOS.") (1060 "SAGE" "IF YOU CAN FREE THE FOUR OF US, WE CAN USE OUR COMBINED POWERS") - (1180 "SAGE" "TO BREAK THE FORCE SHIELD SURROUNDING THE ROBOT, BEFORE THEY USE IT TO DESTROY THE WORLD.") + (1180 "SAGE" "TO BREAK THE FORCE SHIELD SURROUNDING THE ROBOT") + (1265 "SAGE" "BEFORE THEY USE IT TO DESTROY THE WORLD.") ) ("green-sagecage-outro-preboss" (66 "GOL" "YOU'RE TOO LATE, SAMOS.") - (125 "GOL" "ONCE I POSSESS LIMITLESS DARK ECO, I WILL HAVE THE KEY TO CREATION ITSELF!") - (335 "SAGE" "THIS IS MADNESS! RELEASING THAT MUCH DARK ECO WILL DESTROY EVERYTHING WE KNOW!") + (125 "GOL" "ONCE I POSSESS LIMITLESS DARK ECO") + (221 "GOL" "I WILL HAVE THE KEY TO CREATION ITSELF!") + (335 "SAGE" "THIS IS MADNESS!") + (394 "SAGE" "RELEASING THAT MUCH DARK ECO WILL DESTROY EVERYTHING WE KNOW!") (503) (510 "SAGE" "JUST LOOK WHAT IT'S DONE TO YOU!") (578) @@ -2219,7 +2381,8 @@ (693) (700 "DAXTER" "BEAUTY? HAVE YOU TWO LOOKED IN THE MIRROR LATELY?") (825) - (834 "MAIA" "JUST WAIT UNTIL WE OPEN THE SILOS, LITTLE ONE. YOU THINK SHORT AND FUZZY IS BAD?") + (834 "MAIA" "JUST WAIT UNTIL WE OPEN THE SILOS, LITTLE ONE.") + (944 "MAIA" "YOU THINK SHORT AND FUZZY IS BAD?") (1028) (1036 "GOL" "AND TO THINK, YOU TWO TRAVELLED ALL THIS WAY FOR MY HELP.") (1180 "GOL" "FOOLS! ENJOY YOUR FRONT ROW SEATS TO THE RECREATION OF THE WORLD!") @@ -2233,25 +2396,28 @@ (282 "SAGE" "AND TOGETHER WE'LL OPEN THE SHIELD DOOR SURROUNDING THE PRECURSOR ROBOT.") (402) (405 "DAXTER" "YEAH YEAH THAT SOUNDS LIKE A GOOD START.") - (460 "DAXTER" "AND THEN AFTER YOU GUYS OPEN THAT SHIELD, WHAT ARE YOU GONNA DO ABOUT THE ROBOT?") + (460 "DAXTER" "AND THEN AFTER YOU GUYS OPEN THAT SHIELD") + (520 "DAXTER" "WHAT ARE YOU GONNA DO ABOUT THE ROBOT?") (576 "SAGE" "NOTHING, DAXTER. WE HAVE TO KEEP THE SHIELD OPEN.") (702) (705 "SAGE" "IT'S UP TO YOU TWO TO FIGURE OUT HOW TO DESTROY THE ROBOT.") (823 "DAXTER" "OH, GREAT. I GET TO HELP THE GUY THAT TURNED ME INTO A FURBALL") (983 "DAXTER" "DESTROY THE ONLY PERSON WHO CAN TURN ME BACK!") (1108) - (1161 "SAGE" "FIRST, SAVE THE WORLD! THEN WE'LL TRY TO CONVINCE GOL TO HELP DAXTER.") + (1161 "SAGE" "FIRST, SAVE THE WORLD!") + (1238 "SAGE" "THEN WE'LL TRY TO CONVINCE GOL TO HELP DAXTER.") ) ("redsage-resolution" - (58 "RED SAGE" "(CHUCKLES) YOU'VE FINALLY COME TO RESCUE ME.") - (196 "RED SAGE" "DO YOU KNOW HOW LONG I'VE BEEN IN HERE? WHAT TOOK YOU SO LONG? AND UH... (CHUCKLES)") - (378 "RED SAGE" "WHAT ARE YOUR NAMES?") + (58 "RED SAGE" "HE-HE-HEH... YOU'VE FINALLY COME TO RESCUE ME.") + (196 "RED SAGE" "DO YOU KNOW HOW LONG I'VE BEEN IN HERE?") + (274 "RED SAGE" "WHAT TOOK YOU SO LONG? AND UH, HE-HE-HEH...") + (379 "RED SAGE" "WHAT ARE YOUR NAMES?") (428) - (436 "DAXTER" "I'M DAXTER! HE'S JAK, HE'S WITH ME.") + (437 "DAXTER" "I'M DAXTER! HE'S JAK, HE'S WITH ME.") (542 :offscreen "RED SAGE" "GOOD JOB, DAXTER. YOU'RE A REAL HERO.") - (677) - (703 "RED SAGE" "YOU'VE GOT TO STOP GOL FROM LAUNCHING THE ROBOT.") + (678) + (704 "RED SAGE" "YOU'VE GOT TO STOP GOL FROM LAUNCHING THE ROBOT.") (837 "RED SAGE" "I'LL USE MY ECO POWER TO HELP OPEN THE SHIELD DOOR.") ) @@ -2259,12 +2425,13 @@ (57 "YELLOW SAGE" "WHO WOULDA THOUGHT I'D LIVE TO SEE THE DAY") (137 "YELLOW SAGE" "WHEN I NEEDED TO BE RESCUED BY A BOY AND HIS MUSKRAT!") (262) - (271 "YELLOW SAGE" "(SIGHS) I'M GONNA GIVE GOL AND MAIA A LITTLE PAYBACK FOR THIS EMBARRASSMENT!") + (271 "YELLOW SAGE" "AHH... I'M GONNA GIVE GOL AND MAIA") + (377 "YELLOW SAGE" "A LITTLE PAYBACK FOR THIS EMBARRASSMENT!") (475) (485 "YELLOW SAGE" "THEN WE'LL SEE ABOUT COOKING UP SOME MUSKRAT STEW...") - (602) - (610 "DAXTER" "(GULPS)") - (630) + (601) + (609 "DAXTER" "(GULPS)") + (633) ) ("BLU-AM01" :hint #x0 (0 "BLUE SAGE" "A LITTLE BIT OF HELP WOULD BE GOOD!")) @@ -2307,7 +2474,8 @@ (235) (274 "DAXTER" "STAY FUZZY, SAVE THE WORLD... CHOICES...") (404) - (437 "DAXTER" "OKAY, FINE, WE'LL SAVE THE WORLD. BUT DO IT QUICKLY BEFORE I CHANGE MY MIND!") + (437 "DAXTER" "OKAY, FINE, WE'LL SAVE THE WORLD.") + (525 "DAXTER" "BUT DO IT QUICKLY BEFORE I CHANGE MY MIND!") (634) ) @@ -2323,17 +2491,21 @@ (745) (751 "KEIRA" "BUT, DAXTER, NOW WE CAN'T CHANGE YOU BACK.") (845) - (847 "DAXTER" "DON'T WORRY ABOUT ME, BABY. YOU KNOW WHAT THEY SAY: BIG THINGS COME IN SMALL PACKAGES.") + (847 "DAXTER" "DON'T WORRY ABOUT ME, BABY.") + (914 "DAXTER" "YOU KNOW WHAT THEY SAY: BIG THINGS COME IN SMALL PACKAGES.") (1096) (1104 "BLUE SAGE" "JAK, YOU HAVE AN INCREDIBLE TALENT FOR CHANNELLING ECO!") (1219) (1226 "BLUE SAGE" "SAMOS, YOU MAY HAVE BEEN RIGHT ABOUT THIS ONE AFTER ALL!") (1318) - (1323 "RED SAGE" "AND KEIRA, WITHOUT YOUR HELP AND INGENUITY, NONE OF THIS WOULD HAVE BEEN POSSIBLE.") - (1515 "RED SAGE" "HM-HM-HM. PERHAPS WE FOUND ANOTHER SAGE NOW THAT GOL AND MAIA ARE LOST...") + (1323 "RED SAGE" "AND KEIRA, WITHOUT YOUR HELP AND INGENUITY") + (1447 "RED SAGE" "NONE OF THIS WOULD HAVE BEEN POSSIBLE.") + (1515 "RED SAGE" "HM-HM-HM. PERHAPS WE FOUND ANOTHER SAGE") + (1640 "RED SAGE" "NOW THAT GOL AND MAIA ARE LOST...") (1728) (1731 "SAGE" "YES, GOL AND MAIA... THE DARK ECO PROBABLY DESTROYED THEM.") - (1916 :offscreen "SAGE" "EH, PROBABLY...") + (1916) + (1922 :offscreen "SAGE" "EH, PROBABLY...") (1999) (2003 "DAXTER" "AH WHO CARES? BRING 'EM ON, WE CAN TAKE 'EM AGAIN! RIGHT JAK?") (2168) diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index 4aab74a700..d1119571cc 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -279,7 +279,8 @@ void OpenGLRenderer::init_bucket_renderers() { init_bucket_renderer("debug", BucketCategory::OTHER, BucketId::DEBUG, 0x20000); init_bucket_renderer("debug-no-zbuf", BucketCategory::OTHER, BucketId::DEBUG_NO_ZBUF, 0x8000); - init_bucket_renderer("subtitle", BucketCategory::OTHER, BucketId::SUBTITLE, 2000); + // an extra custom bucket! + init_bucket_renderer("subtitle", BucketCategory::OTHER, BucketId::SUBTITLE, 6000); // for now, for any unset renderers, just set them to an EmptyBucketRenderer. for (size_t i = 0; i < m_bucket_renderers.size(); i++) { diff --git a/goal_src/jak1/pc/subtitle.gc b/goal_src/jak1/pc/subtitle.gc index 67b50bc15d..8453653f3e 100644 --- a/goal_src/jak1/pc/subtitle.gc +++ b/goal_src/jak1/pc/subtitle.gc @@ -23,6 +23,8 @@ (defconstant PC_SUBTITLE_FILE_SIZE (* 192 1024)) ;; 192K heap for subtitles. adjust later if necessary. (defconstant PC_SUBTITLE_FILE_NAME "subtit") +(defconstant PC_SUB_DBG_Y 32) +(defconstant PC_SUB_DBG_CHECK_GROUP_SIZE 22) (defglobalconstant PC_SUBTITLE_DEBUG #f) @@ -64,7 +66,7 @@ ( ;; the channel to play the text on, useful for lookup since it can also be used to tell subtitle types apart (kind pc-subtitle-channel) - ;; the amount of keyframes + ;; the amount of keyframes/lines (length int16) ;; data (keyframes (inline-array subtitle-keyframe)) @@ -124,7 +126,7 @@ (define *SUBTITLE-bank* (new 'static 'subtitle-bank - :scale 0.49 + :scale 0.5 :width 0.87 :height 0.75 :lines 2.0 @@ -146,6 +148,12 @@ (text-id game-text-id) (cur-channel pc-subtitle-channel) + ;; debug things + (debug-lines? symbol) + (checking-lines? symbol) + (current-debug-scene int16) + (current-debug-line int16) + (want-subtitle subtitle-keyframe) ;; the subtitle we want to display (hint-subtitle? symbol) ) @@ -154,7 +162,8 @@ (subtitle-format (_type_ subtitle-keyframe) string) ) (:states - subtitle-debug) + subtitle-debug + subtitle-debug-checking-lines) ) @@ -287,7 +296,8 @@ `(begin (asm-text-file subtitle :files ("game/assets/game_subtitle.gp")) (if *subtitle-text* - (+! (-> *subtitle-text* lang) (the-as pc-subtitle-lang 1))))) + (+! (-> *subtitle-text* lang) (the-as pc-subtitle-lang 1))) + (load-level-subtitle-files 0))) @@ -543,6 +553,34 @@ (if (< pos 0) -1 (the int (/ pos (/ 1024.0 60))))) +(defbehavior setup-subtitle-font subtitle () + "setup the subtitle font." + + ;; set font settings. + (set! (-> self font origin x) (* (- 1.0 (-> *SUBTITLE-bank* width)) 256)) + (set! (-> self font origin y) (* (if (not (movie?)) + (-> *SUBTITLE-bank* hint-height) + (-> *SUBTITLE-bank* height) + ) 224)) + (set-width! (-> self font) (the int (* (-> *SUBTITLE-bank* width) 512))) + (set-height! (-> self font) (the int (* (-> *SUBTITLE-bank* lines) 11))) + (set-scale! (-> self font) (-> *SUBTITLE-bank* scale)) + ) + +(defbehavior draw-subtitle subtitle () + "draw the current subtitle using the current font." + + (when (and (-> self want-subtitle) (subtitle? (-> self hint-subtitle?))) + ;; we got a valid subtitle! render it. + (hide-bottom-hud) + (print-game-subtitle (subtitle-format self (-> self want-subtitle)) (-> self font) #f 128 22) + (#when PC_SUBTITLE_DEBUG + (draw-debug-text-box (-> self font)) + ) + ) + ) + + (defstate subtitle-process (subtitle) :event (behavior ((from process) (argc int) (msg symbol) (block event-message-block)) @@ -602,6 +640,14 @@ ;; do subtitles + ;; intro first time notice (if subtitles are disabled) + (when (and (= (pc-subtitle-channel movie) (-> self cur-channel)) + (!= (-> self old-spool-name) (-> self spool-name)) + (string= (-> self spool-name) "sage-intro-sequence-a")) + (set-state-time) + (set! (-> self notice-id) (game-text-id subtitle-hint)) + ) + ;; get a subtitle info that matches our current status (let ((keyframe (the subtitle-keyframe #f))) (when *subtitle-text* @@ -611,6 +657,16 @@ (set! (-> self hint-subtitle?) #f) (awhen (get-scene-by-name *subtitle-text* (-> self cur-channel) (-> self spool-name)) + ;; during a cutscene, check if user toggled subtitles + (when (and (= 'game *master-mode*) + (cpad-pressed? 0 square)) + (not! (-> *pc-settings* subtitles?)) + (set-state-time) + (if (-> *pc-settings* subtitles?) + (set! (-> self notice-id) (game-text-id subtitle-enabled)) + (set! (-> self notice-id) (game-text-id subtitle-disabled)) + ) + ) ;; find out position in the scene. (let ((pos 0)) ;; get frame num @@ -648,26 +704,9 @@ ;; save whatever subtitle we got. (set! (-> self want-subtitle) keyframe)) - (when (and (!= (-> self old-spool-name) (-> self spool-name)) - (string= (-> self spool-name) "sage-intro-sequence-a")) - (set-state-time) - (set! (-> self notice-id) (game-text-id subtitle-hint)) - ) ;; keep this for later (set! (-> self old-spool-name) (-> self spool-name)) - ;; during a cutscene, check if user toggled subtitles - (when (and (= (pc-subtitle-channel movie) (-> self cur-channel)) - (= 'game *master-mode*) - (cpad-pressed? 0 square)) - (not! (-> *pc-settings* subtitles?)) - (set-state-time) - (if (-> *pc-settings* subtitles?) - (set! (-> self notice-id) (game-text-id subtitle-enabled)) - (set! (-> self notice-id) (game-text-id subtitle-disabled)) - ) - ) - (when *debug-segment* (when (and (cpad-hold? 0 l3) (cpad-pressed? 0 start)) (cpad-clear! 0 start) @@ -680,24 +719,8 @@ :post (behavior () - ;; set font settings. - (set! (-> self font origin x) (* (- 1.0 (-> *SUBTITLE-bank* width)) 256)) - (set! (-> self font origin y) (* (if (not (movie?)) - (-> *SUBTITLE-bank* hint-height) - (-> *SUBTITLE-bank* height) - ) 224)) - (set-width! (-> self font) (the int (* (-> *SUBTITLE-bank* width) 512))) - (set-height! (-> self font) (the int (* (-> *SUBTITLE-bank* lines) 11))) - (set-scale! (-> self font) (-> *SUBTITLE-bank* scale)) - - (when (and (-> self want-subtitle) (subtitle? (-> self hint-subtitle?))) - ;; we got a valid subtitle! render it. - (hide-bottom-hud) - (print-game-subtitle (subtitle-format self (-> self want-subtitle)) (-> self font) #f 128 22) - (#when PC_SUBTITLE_DEBUG - (draw-debug-text-box (-> self font)) - ) - ) + (setup-subtitle-font) + (draw-subtitle) (cond ((!= *master-mode* 'game) @@ -723,7 +746,6 @@ ) - (defstate subtitle-debug (subtitle) @@ -739,46 +761,131 @@ (mem-copy! (the pointer (-> self bank-backup)) (the pointer *SUBTITLE-bank*) (size-of subtitle-bank)) (set-master-mode 'pause) ) - :exit (behavior () - (toggle-pause) (none)) ;; todo fuck :trans (behavior () (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf)) (bucket-id debug)) - (draw-string-xy "~3LSUBTITLE DEBUG!~0L" buf 16 40 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "Square: reset" buf 16 48 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "Up/down: Move vertically" buf 16 56 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "Triangle+R1/L1: width" buf 16 64 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "Triangle+R2/L2: height" buf 16 72 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "Circle+R1/L1: scale" buf 16 80 (font-color default) (font-flags shadow kerning)) - (draw-string-xy "L3+Start: exit" buf 16 88 (font-color default) (font-flags shadow kerning)) - - ) + (draw-string-xy "~3LSUBTITLE DEBUG!~0L" buf 14 (+ PC_SUB_DBG_Y (* 0 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "L3+Start: exit" buf 14 (+ PC_SUB_DBG_Y (* 1 8)) (font-color default) (font-flags shadow kerning)) + (if (!= 'pause *master-mode*) + (draw-string-xy "Pause the game to continue" buf 14 (+ PC_SUB_DBG_Y (* 2 8)) (font-color default) (font-flags shadow kerning))) (when (= 'pause *master-mode*) - (when (cpad-pressed? 0 square) - (mem-copy! (the pointer *SUBTITLE-bank*) (the pointer (-> self bank-backup)) (size-of subtitle-bank)) - ) - - (when (cpad-hold? 0 up) (+! (-> *SUBTITLE-bank* height) -0.01)) - (when (cpad-hold? 0 down) (+! (-> *SUBTITLE-bank* height) 0.01)) - (cond - ((cpad-hold? 0 triangle) - (when (cpad-hold? 0 r1) (-! (-> *SUBTITLE-bank* width) 0.01)) - (when (cpad-hold? 0 l1) (+! (-> *SUBTITLE-bank* width) 0.01)) - (when (cpad-hold? 0 r2) (-! (-> *SUBTITLE-bank* lines) 0.05)) - (when (cpad-hold? 0 l2) (+! (-> *SUBTITLE-bank* lines) 0.05)) + ((and (cpad-hold? 0 l3) (cpad-pressed? 0 x)) + (set! (-> self debug-lines?) #t) ) - ((cpad-hold? 0 circle) - (when (cpad-hold? 0 r1) (+! (-> *SUBTITLE-bank* scale) 0.01)) - (when (cpad-hold? 0 l1) (-! (-> *SUBTITLE-bank* scale) 0.01)) + ((and (cpad-hold? 0 l3) (cpad-pressed? 0 triangle)) + (set! (-> self debug-lines?) #f) ) ) - ) + (draw-string-xy "L3+X: debug lines" buf 14 (+ PC_SUB_DBG_Y (* 2 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "L3+Triangle: debug box" buf 14 (+ PC_SUB_DBG_Y (* 3 8)) (font-color default) (font-flags shadow kerning)) + (cond + ((or (not *subtitle-text*) (zero? (-> *subtitle-text* length))) + (draw-string-xy "NO SUBTITLES LOADED!!!" buf 14 (+ PC_SUB_DBG_Y (* 10 8)) (font-color red) (font-flags shadow kerning)) + (load-level-subtitle-files 0) + (set! (-> self current-debug-scene) 0) + (set! (-> self current-debug-line) 0) + ) + ((-> self debug-lines?) + + (cond + ((cpad-pressed? 0 square) + (true! (-> self checking-lines?)) + ) + ((cpad-pressed? 0 left) + (if (> (-> self current-debug-line) 0) + (1-! (-> self current-debug-line))) + ) + ((cpad-pressed? 0 right) + (if (< (-> self current-debug-line) (1- (-> *subtitle-text* data (-> self current-debug-scene) length))) + (1+! (-> self current-debug-line))) + ) + ((or (cpad-pressed? 0 up) (and (cpad-hold? 0 l2) (cpad-hold? 0 up))) + (when (> (-> self current-debug-scene) 0) + (1-! (-> self current-debug-scene)) + (set! (-> self current-debug-line) 0)) + ) + ((or (cpad-pressed? 0 down) (and (cpad-hold? 0 l2) (cpad-hold? 0 down))) + (when (< (-> self current-debug-scene) (1- (-> *subtitle-text* length))) + (1+! (-> self current-debug-scene)) + (set! (-> self current-debug-line) 0)) + ) + ) + + (let ((cur-scene (-> *subtitle-text* data (-> self current-debug-scene)))) + (if (nonzero? (-> cur-scene length)) + (set! (-> self want-subtitle) (-> *subtitle-text* data (-> self current-debug-scene) keyframes (-> self current-debug-line))) + (set! (-> self want-subtitle) #f)) + + (draw-string-xy "Up/down: Pick scene" buf 14 (+ PC_SUB_DBG_Y (* 4 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "L2+Up/down: Pick scene (fast)" buf 14 (+ PC_SUB_DBG_Y (* 5 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Left/right: Pick line" buf 14 (+ PC_SUB_DBG_Y (* 6 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Square: Check all line heights" buf 14 (+ PC_SUB_DBG_Y (* 7 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy (string-format "Scene: ~D/~D" (1+ (-> self current-debug-scene)) (-> *subtitle-text* length)) + buf 14 (+ PC_SUB_DBG_Y (* 8 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy (string-format "Line: ~D/~D" (1+ (-> self current-debug-line)) (-> cur-scene length)) + buf 14 (+ PC_SUB_DBG_Y (* 9 8)) (font-color default) (font-flags shadow kerning)) + + (case (-> cur-scene kind) + (((pc-subtitle-channel movie)) + (draw-string-xy (string-format "Current scene: ~3L~A~0L" (-> cur-scene name)) + buf 14 (+ PC_SUB_DBG_Y (* 10 8)) (font-color default) (font-flags shadow kerning)) + ) + (((pc-subtitle-channel hint-named)) + (draw-string-xy (string-format "Current scene: ~3L~A~0L (~3L#x~X~0L)" (-> cur-scene name) (-> cur-scene id)) + buf 14 (+ PC_SUB_DBG_Y (* 10 8)) (font-color default) (font-flags shadow kerning)) + ) + (((pc-subtitle-channel hint)) + (draw-string-xy (string-format "Current scene: ~3L#x~X~0L" (-> cur-scene id)) + buf 14 (+ PC_SUB_DBG_Y (* 10 8)) (font-color default) (font-flags shadow kerning)) + ) + (else + (draw-string-xy (string-format "Unknown scene kind ~D" (-> cur-scene kind)) + buf 14 (+ PC_SUB_DBG_Y (* 10 8)) (font-color red) (font-flags shadow kerning)) + ) + )) + + ) + + (else + (draw-string-xy "Square: reset" buf 14 (+ PC_SUB_DBG_Y (* 4 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Up/down: Move vertically" buf 14 (+ PC_SUB_DBG_Y (* 5 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Triangle+R1/L1: width" buf 14 (+ PC_SUB_DBG_Y (* 6 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Triangle+R2/L2: height" buf 14 (+ PC_SUB_DBG_Y (* 7 8)) (font-color default) (font-flags shadow kerning)) + (draw-string-xy "Circle+R1/L1: scale" buf 14 (+ PC_SUB_DBG_Y (* 8 8)) (font-color default) (font-flags shadow kerning)) + + + (when (cpad-pressed? 0 square) + (mem-copy! (the pointer *SUBTITLE-bank*) (the pointer (-> self bank-backup)) (size-of subtitle-bank)) + ) + + (when (cpad-hold? 0 up) (+! (-> *SUBTITLE-bank* height) -0.01)) + (when (cpad-hold? 0 down) (+! (-> *SUBTITLE-bank* height) 0.01)) + + (cond + ((cpad-hold? 0 triangle) + (when (cpad-hold? 0 r1) (-! (-> *SUBTITLE-bank* width) 0.01)) + (when (cpad-hold? 0 l1) (+! (-> *SUBTITLE-bank* width) 0.01)) + (when (cpad-hold? 0 r2) (-! (-> *SUBTITLE-bank* lines) 0.05)) + (when (cpad-hold? 0 l2) (+! (-> *SUBTITLE-bank* lines) 0.05)) + ) + ((cpad-hold? 0 circle) + (when (cpad-hold? 0 r1) (+! (-> *SUBTITLE-bank* scale) 0.01)) + (when (cpad-hold? 0 l1) (-! (-> *SUBTITLE-bank* scale) 0.01)) + ) + )) + ) + )) + + (when (-> self checking-lines?) + (false! (-> self checking-lines?)) + (go subtitle-debug-checking-lines) + ) (when (and (cpad-hold? 0 l3) (cpad-pressed? 0 start)) (cpad-clear! 0 start) (send-event self 'debug) @@ -787,10 +894,54 @@ (none)) :code (-> subtitle-process code) - :post (-> subtitle-process post) + :post (behavior () + (setup-subtitle-font) + (draw-subtitle) + (draw-debug-text-box (-> self font)) + 0) ) +(defstate subtitle-debug-checking-lines (subtitle) + + :trans (behavior () (setup-subtitle-font) (none)) + :code (behavior () + (protect ((-> *pc-settings* subtitle-speaker?)) + (set! (-> *pc-settings* subtitle-speaker?) #t) + (let ((lines-so-far 0) + (lines-this-time 0) + (bad-lines 0)) + (dotimes (i (length *subtitle-text*)) + (dotimes (ii (length (-> *subtitle-text* data i))) + (when (= lines-this-time PC_SUB_DBG_CHECK_GROUP_SIZE) + (set! lines-this-time 0) + (suspend)) + + (set! (-> self want-subtitle) (-> *subtitle-text* data i keyframes ii)) + (1+! lines-this-time) + (when (< (* (-> *SUBTITLE-bank* lines) 11) (print-game-subtitle (subtitle-format self (-> self want-subtitle)) (-> self font) #f 128 22)) + (format 0 "LINE ~D IN SCENE ~D IS TOO LARGE!~%" (1+ ii) (1+ i)) + (format #t "LINE ~D IN SCENE ~D IS TOO LARGE!~%" (1+ ii) (1+ i)) + (1+! bad-lines) + ) + ) + ) + (suspend) + (if (> bad-lines 0) + (format 0 "~D bad lines detected.~%" bad-lines) + (format 0 "no bad lines detected!~%" bad-lines)) + )) + (go subtitle-debug) + ) + :post (behavior () + (with-dma-buffer-add-bucket ((buf (-> (current-frame) debug-buf)) + (bucket-id debug)) + (draw-string-xy "Checking for bad lines... See console for info" buf 14 PC_SUB_DBG_Y (font-color red) (font-flags shadow kerning)) + ) + (draw-debug-text-box (-> self font)) + 0) + + ) @@ -817,6 +968,8 @@ (set! (-> self font) (new 'process 'font-context *font-default-matrix* 0 0 0.0 (font-color default) (font-flags shadow kerning middle large))) + (set! (-> self debug-lines?) #t) + (set! (-> self checking-lines?) #f) (go subtitle-process) )