village1, jungle, beach and firecanyon subtitles (#1388)

* vi1 subtitles + minor fixes

* beach subtitles

* minor fix

* jungle subtitle

* Update iso_queue.cpp

* firecanyon subtitles

game/assets/game_text.gp

@@ -4,7 +4,8 @@
 ;; you can find the game-text-version parsing in .cpp and an enum in goal-lib.gc
 
 (text
-  (jak1-v1 "assets/game_text.txt")
+  (jak1-v1 "assets/game_text.txt") ;; this is the decompiler-generated file!
+  ;; add custom files down here
   (jak1-v1 "game/assets/jak1/text/game_text_en.gs")
   )
 

game/assets/jak1/subtitle/game_subtitle_en.gs

@@ -148,7 +148,7 @@
   )
 ("sksp0009" :hint #x251
   (0 "DAXTER" "WHAT A WEIRD-LOOKING THING! I'LL BET WE CAN GET THIS OPEN")
-  (207 "DAXTER" "IF YOU'RE POWERED UP WITH THAT ZAPPY BLUE ECO STUFF.")
+  (206 "DAXTER" "IF YOU'RE POWERED UP WITH THAT ZAPPY BLUE ECO STUFF.")
   )
 ("sksp0035" :hint #x25c
   (0 "DAXTER" "YEAH, SO WE GOT A PRECURSOR LAUNCHER HERE")
@@ -233,9 +233,13 @@
   (0 "DAXTER" "MAYBE WE SHOULD GO ROOT OUT THE FISHERMAN.")
   (106 "DAXTER" "I HEARD HE WAS IN THE JUNGLE FISHING BY THE LOWER RIVER!")
   )
+("sksp018a" :hint #x297
+  (0 "DAXTER" "THAT LAZY FARMER OWES US A POWER CELL!")
+  (156 "DAXTER" "LET'S GO TALK TO HIM!")
+  )
 ("asstvb04" :hint #x2b1
   (0 "KEIRA" "GOOD, YOU'VE COLLECTED ENOUGH POWER CELLS TO FUEL MY HEAT SHIELD!")
-  (235 "KEIRA" "MEET ME BY THE ENTRANCE TO THE FIRE CANYON BY CLIMBING THE CLIFF BEHIND THE FARMER'S HOUSE.")
+  (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!")
   )
 ("asstvb08" :hint #x2b2
@@ -320,6 +324,27 @@
   (295)
   )
 
+("assistant-introduction-race-bike"
+  (9 "DAXTER" "HEY BABY, WHAT'CHA WORKIN' ON?")
+  (63 "KEIRA" "BE CAREFUL WITH THAT! I'M TRYING TO FIGURE HOW TO TRANSPORT THE ZOOMER")
+  (200 "KEIRA" "USING THE TRANS-PADS THE PRECURSORS LEFT ALL OVER THE WORLD.")
+  (308)
+  (312 :offscreen "KEIRA" "IF YOU COME ACROSS ONE OF THESE PADS I CAN LOCK ON TO YOUR COMMUNICATOR'S LOCATION")
+  (453 :offscreen "KEIRA" "AND SEND YOU THE ZOOMER!")
+  (508 "KEIRA" "KEEP AN EYE OUT FOR A TRANS-PAD WHEN YOU EXPLORE MISTY ISLAND, AND WHEREVER ELSE YOU GO!")
+  (665)
+  )
+
+("assistant-reminder-1-race-bike"
+  (19 "KEIRA" "I'VE DEFINITELY FIGURED OUT HOW TO USE THE TRANS-PADS.")
+  (106 "KEIRA" "NOW GO TO MISTY ISLAND AND I'LL SEND THE ZOOMER OVER TO YOU.")
+  (229)
+  )
+
+("assistant-reminder-1-generic"
+  (25 "KEIRA" "HEY GUYS! KEEP COLLECTING POWER CELLS, THEY'RE THE KEY TO CONTINUING OUR JOURNEY NORTH.")
+  )
+
 ("farmer-introduction"
   (1 "FARMER" "GOTTA MILK THOSE YAKOWS, GOTTA MILK THOSE YAKOWS...")
   (113 "FARMER" "OH! IT'S YOU... JUST RESTIN' MY TRIED BONES. I'VE BEEN TRYING TO GET THOSE ORNERY YAKOWS")
@@ -379,6 +404,19 @@
 ;; -----------------
 ;; oracle
 
+("oracle-intro-1"
+  (0 "ORACLE" "WHO AWAKENS THE ORACLE?")
+  (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.")
+  (390)
+  (395 "ORACLE" "PRESENT TO ME 120 PRECURSOR ORBS FOR EACH POWER CELL I CONTAIN.")
+  )
+("oracle-reminder-1"
+  (0 "ORACLE" "BRING TO ME 120 PRECURSOR ORBS AND I WILL AWARD YOU A POWER CELL.")
+  )
+
 ("oracle-right-eye-1" (0 "ORACLE" "FOR YOUR GIFT, ANOTHER POWER CELL IS YOURS."))
 ("oracle-left-eye-1"  (0 "ORACLE" "YOU HAVE PROVEN YOURSELF WORTHY. HERE IS A POWER CELL."))
 ("oracle-right-eye-2" (0 "ORACLE" "HERE IS ANOTHER POWER CELL FOR YOUR QUEST."))
@@ -387,6 +425,344 @@
 ("oracle-left-eye-3"  (0 "ORACLE" "FOR YOUR EFFORT, A POWER CELL IS THE REWARD."))
 
 
+;; -----------------
+;; beach
+
+("CHI-LO01" :hint 0 (0 "MAYOR" "...WINDMILL, MONSTERS, POWER, RE-ELECTION..."))
+("CHI-LO02" :hint 0 (0 "MAYOR" "...THE POLLS, I... MONSTERS, HM... RE-ELECTION, OH..."))
+("CHI-AM01" :hint 0 (0 "MAYOR" "THIS IS A CATASTROPHE. A CATASTROPHE I SAY!"))
+("CHI-AM02" :hint 0 (0 "MAYOR" "THEY WANT ME TO GO INTO THE JUNGLE - ME! HO HO OH...")
+                    (214)
+                    (219 "MAYOR" "I'D SOONER WRESTLE AN ENRAGED FLUT FLUT."))
+("CHI-AM03" :hint 0 (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?"))
+("CHI-AM04" :hint 0 (0 "MAYOR" "I DON'T... I'D, I'D... OOH, MAYBE I SHOULD RAISE TAXES (STUTTERS) TO PAY FOR THIS MESS."))
+("CHI-AM05" :hint 0 (0 "MAYOR" "PROBLEMS... PROBLEMS... PROBLEMS!"))
+("CHI-AM06" :hint 0 (0 "MAYOR" "(SOBS) I'LL NEVER GET RE-ELECTED NOW..."))
+("CHI-AM07" :hint 0 (0 "MAYOR" "(MOANS) WHAT'S HAPPENED TO THE VILLAGE'S ENERGY BEAM?"))
+("CHI-AM08" :hint 0 (0 "MAYOR" "I... THEY, I DON'T... (MUTTERS)"))
+("SCU-AM01" :hint 0 (0 "SCULPTOR" "AW... I JUST CAN'T DO IT ANYMORE."))
+("SCU-AM02" :hint 0 (0 "SCULPTOR" "AW, I WISH I HAD SOME INSPIRATION."))
+("SCU-AM03" :hint 0 (0 "SCULPTOR" "I'M AS INSPIRED AS... THIS ROCK."))
+("SCU-AM04" :hint 0 (0 "SCULPTOR" "AW... WHERE IS MY MUSE?"))
+("SCU-AM05" :hint 0 (0 "SCULPTOR" "I CAN'T WORK LIKE THIS!"))
+("SCU-AM06" :hint 0 (0 "SCULPTOR" "AW MAN... WILL SHE EVER COME BACK TO ME?"))
+("SCU-LO01" :hint 0 (0 "SCULPTOR" "AW MAN..."))
+("BIR-AM01" :hint 0 (0 "BIRDWATCHER" "ARE YOU NEAR THE EGG YET?"))
+("BIR-AM02" :hint 0 (0 "BIRDWATCHER" "THAT'S IT, JUST A LITTLE FURTHER!"))
+("BIR-AM03" :hint 0 (0 "BIRDWATCHER" "OH, GOOD, NOW PUSH IT. OH, GENTLY NOW!"))
+("BIR-AM04" :hint 0 (0 "BIRDWATCHER" "OH, MY, THAT WASN'T GENTLE!"))
+("BIR-AM05" :hint 0 (0 "BIRDWATCHER" "COME ON, PUSH THE EGG OFF THE CLIFF!"))
+("BIR-AM06" :hint 0 (0 "BIRDWATCHER" "OHH!"))
+("BIR-AM07" :hint 0 (0 "BIRDWATCHER" "OH, HERE, BIRDIE BIRDIE. HERE, BIRDIE BIRDIE."))
+("BIR-AM08" :hint 0 (0 "BIRDWATCHER" "HERE, BIRDIE BIRDIE."))
+("BIR-AM09" :hint 0 (0 "BIRDWATCHER" "BE CAREFUL, IT DOESN'T LOOK SAFE UP THERE!"))
+("BIR-AM10" :hint 0 (0 "BIRDWATCHER" "CAREFUL, EASY DOES IT!"))
+("BIR-AM11" :hint 0 (0 "BIRDWATCHER" "GOOD JOB! NOW MEET ME DOWN HERE BY THE EGG."))
+("BIR-AM12" :hint 0 (0 "BIRDWATCHER" "YOU MUST BE A TRUE ANIMAL LOVER!"))
+("BIR-AM13" :hint 0 (0 "BIRDWATCHER" "DO YOU SEE ANY OTHER BIRDS UP THERE?"))
+("BIR-LO01" :hint 0 (0 "BIRDWATCHER" "(KISS) (WHISTLE)"))
+("BIR-LO02" :hint 0 (0 "BIRDWATCHER" "OH MY, THAT'S A PRETTY ONE."))
+("BIR-LO03" :hint 0 (0 "BIRDWATCHER" "OH LOOK, A MUCKY-MUCK."))
+
+
+("sksp0019" :hint #x236 (0 "DAXTER" "HEY, SEAGULLS! LET'S BUZZ 'EM FOR KICKS."))
+("sksp0026" :hint #x237
+  (0 "DAXTER" "HEY! THAT PELICAN JUST SNAGGED A POWER CELL!")
+  (197)
+  (200 "DAXTER" "LET'S GO KICK SOME BIG BIRD BUTT!")
+  )
+("sksp0030" :hint #x239 (0 "DAXTER" "HEY, TRY PUNCHING THE ROCKS TO GET 'EM OUT OF THE WAY!"))
+("sksp0034" :hint #x23b (0 "DAXTER" "AWOOGA! AWOOGA! DIVE FOR THOSE ORBS, JAK, DIVE!"))
+("sksp0020" :hint #x268 (0 "DAXTER" "YEAH HA HA! LET'S DO THAT AGAIN!"))
+("sksp0022" :hint #x26a (0 "DAXTER" "YEAH HA HA HA HA HA!! WOO HO HO HO!"))
+("sksp0023" :hint #x26b (0 "DAXTER" "WOOHOO!"))
+("sksp0024" :hint #x26c (0 "DAXTER" "YEAH HA HA! YEAH!"))
+("sksp0025" :hint #x273 (0 "DAXTER" "WHOA! THEY CAUSED AN AVALANCHE! LET'S CHECK IT OUT."))
+("sksp0027" :hint #x274 (0 "DAXTER" "QUICK! WE HAVE TO GET TO THE POWER CELL BEFORE THE PELICAN SCOOPS IT UP AGAIN."))
+("sksp0029" :hint #x275
+  (0 "DAXTER" "EH, WE MIGHT WANNA TALK TO THE BIRDWATCHER")
+  (125 "DAXTER" "AND SEE IF WE SCRAMBLED THAT FLUT FLUT EGG.")
+  )
+("sagevb01" :hint #x288
+  (0 "SAGE" "WELL, I SEE THAT YOU TWO HAVE FINALLY DECIDED TO UNBLOCKED MY COLLECTORS.")
+  (347)
+  (352 "SAGE" "I WOULD OFFER MY CONGRATULATIONS, BUT YOU HAVE SO MUCH TO DO I WON'T WASTE YOUR TIME.")
+  (705)
+  (712 "SAGE" "BY THE WAY, IF THINGS DON'T WORK OUT,")
+  (884 "SAGE" "DAXTER COULD ALWAYS GET A JOB CONTROLLING THE VILLAGE RAT PROBLEM.")
+  (1116 "SAGE" "NYEH HA HA HA HA.")
+  )
+("sksp0443" :hint #x2af (0 "DAXTER" "PUNCH THOSE POLES UP FROM BELOW!"))
+
+
+("mayor-introduction"
+  (31 "MAYOR" "NO... (MUTTERS) DON'T TELL ME THAT YOU TWO HAVE PROBLEMS AS WELL!")
+  (171)
+  (174 "MAYOR" "FIRST I HEAR OF MONSTER SIGHTINGS NEAR THE VILLAGE, AND NOW THIS.")
+  (313)
+  (320 "MAYOR" "SEE THOSE GEARS UP THERE, BOYS? SEE THEM? SEE HOW THEY'RE NOT MOVING?")
+  (479 "MAYOR" "THAT MEANS OUR VILLAGE HAS NO POWER!")
+  (569)
+  (578 "MAYOR" "THE ECO BEAM COMING FROM THE JUNGLE TEMPLE HAS BEEN INTERRUPTED!")
+  (685)
+  (689 "MAYOR" "AND BOYS, EVERYONE'S TOO FRIGHTENED TO GO OUT AND FIND OUT WHAT'S HAPPENED.")
+  (850)
+  (864 "DAXTER" "DID YOU PAY THE BILL?")
+  (915)
+  (917 "MAYOR" "YEAH-HMM? OH-HUH-OH, YOU'RE FUNNY.")
+  (1071)
+  (1074 "MAYOR" "NOW LOOK, IF YOU TWO FIX THE ECO BEAM, I'LL GIVE YOU A POWER CELL.")
+  (1262 "MAYOR" "OH OOH OOH AND-AND ANOTHER THING, UH...")
+  (1346 "MAYOR" "IF BY ANY CHANCE YOU'RE INTERESTED IN MAKING A CONTRIBUTION TO MY RE-ELECTION CAMPAIGN,")
+  (1551 "MAYOR" "I-I MIGHT BE WILLING TO PART WITH YET ANOTHER POWER CELL!")
+  (1668)
+  (1671 "MAYOR" "THE MINIMUM CONTRIBUTION IS, OH, A VERY MODEST...")
+  (1797 "MAYOR" "90 PRECURSOR ORBS.")
+  )
+
+("mayor-reminder-beams"
+  (25 "MAYOR" "BACK ALREADY? AND WITHOUT FIXING THE ECO BEAMS?")
+  (157 "MAYOR" "(SOBS) YOUR VILLAGE NEEDS YOU, BOYS!")
+  )
+
+("mayor-reminder-donation"
+  (26 "MAYOR" "AH, HERE TO MAKE A DONATION TO MY CAMPAIGN, OH HO HO HO.")
+  (159 "MAYOR" "90 PRECURSOR ORBS BUYS YOU A POWER CELL, THANK YOU.")
+  )
+
+("mayor-resolution-beams"
+  (28 "MAYOR" "OH HO HO, WHAT A WONDERFUL SIGHT! I THANK YOU!")
+  (205 "MAYOR" "AND THE ENTIRE VILLAGE WILL THANK ME -")
+  (269 "MAYOR" "UH, BOYS, YOU HAVE RESTORED POWER TO THE VILLAGE AND GUARANTEED MY RE-ELECTION!")
+  (472)
+  (475 "MAYOR" "AND FOR THAT, MY BOY, YOU'VE EARNED A POWER CELL.")
+  )
+
+("mayor-resolution-donation"
+  (28 "MAYOR" "SO EH, YOU UH, WANNA MAKE A CONTRIBUTION? GOOD... A-A-A SIZABLE ONE I HOPE.")
+  (219)
+  (224 "MAYOR" "YOOH! EH HE HE, IT'S A, OH, THIS IS A SIZABLE CONTRIBUTION!")
+  (365 "MAYOR" "I, WH-WH-WH-WHY I JUST HOPE THIS POWER CELL ADEQUATELY REPRESENTS MY GRATITUDE.")
+  )
+
+("sculptor-introduction"
+  (30 "SCULPTOR" "HEY... LITTLE FURRY DUDE!")
+  (154)
+  (161 "SCULPTOR" "AWW... I THOUGHT FOR A MOMENT YOU WERE MY MUSE.")
+  (282)
+  (285 "DAXTER" "YOUR WHAT?")
+  (334)
+  (343 "SCULPTOR" "HAVEN'T YOU EVER SEEN A MUSE BEFORE?")
+  (430)
+  (434 "SCULPTOR" "IT'S A LITTLE GLOWIN' SQUIRREL ABOUT YOUR SIZE, FULL OF SPUNK, AND CRAZY AS A LARK!")
+  (622)
+  (632 "DAXTER" "OH, I GET IT! LIKE A SIDEKICK.")
+  (757)
+  (763 "SCULPTOR" "AS A MATTER OF FACT, WITHOUT MY MUSE, I JUST CAN'T SCULPT.")
+  (920)
+  (923 "SCULPTOR" "BUT WITH HER AROUND... I SEE BEAUTY IN EVERYTHING, YOU KNOW?")
+  (1087)
+  (1091 "SCULPTOR" "RIGHT NOW I COULDN'T CHISEL MY WAY OUT OF A BOX.")
+  (1182)
+  (1191 :offscreen "SCULPTOR" "I THINK SHE RAN AWAY TO THAT MISTY ISLAND.")
+  (1278)
+  (1281 "SCULPTOR" "AWW, I JUST HOPE SHE'S ALL RIGHT.")
+  (1370)
+  (1376 "SCULPTOR" "IT'S WORTH A POWER CELL IF YOU BRING HER BACK TO ME!")
+  (1441)
+  (1467 "DAXTER" "WAIT A MINUTE! WE ARE NOT GOING BACK TO MISTY ISLAND!")
+  (1646)
+  (1649 "DAXTER" "ARE WE?")
+  )
+
+("sculptor-reminder-1"
+  (27 "SCULPTOR" "AW HEY DUDES! DID YOU FIND MY MUSE YET?")
+  (169)
+  )
+
+("sculptor-resolution"
+  (87 "SCULPTOR" "OH, MY MUSE! YOU SAVED HER! AW, YOU REALLY ARE THE BEST!")
+  (230 "SCULPTOR" "HERE, TAKE THIS POWER CELL. I WON'T NEED IT NOW THAT I HAVE MY INSPIRATION BACK!")
+  )
+
+("bird-lady-introduction"
+  (125 "BIRDWATCHER" "OH MY, WHAT A HORRIBLY SICK LITTLE BIRD.")
+  (245)
+  (251 "DAXTER" "HUH! YOU DON'T LOOK SO GOOD YOURSELF, LADY!")
+  (326)
+  (331 "BIRDWATCHER" "OH, SORRY. I THOUGHT YOU WERE A SPOTTED ORANGE-BELLIED RAIN FRAY.")
+  (454)
+  (457 "BIRDWATCHER" "YOU KNOW, YESTERDAY I SAW SOME TERRIBLY VICIOUS CREATURES")
+  (578 "BIRDWATCHER" "CAPTURE 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")
+  (951 :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)
+  )
+
+("bird-lady-reminder-1"
+  (56 "BIRDWATCHER" "OH, HELLO AGAIN. DID YOU BOYS FIND THAT BLUE EGG ON THE CLIFF?")
+  (208)
+  (211 "BIRDWATCHER" "PUSH IT OFF THE EDGE AND I'LL GIVE YOU A POWER CELL!")
+  (348)
+  )
+
+("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.")
+  (313)
+  (316 "BIRDWATCHER" "GO SAVE IT BY PUSHING IT OFF THE EDGE OF THE CLIFF, AND I'LL GIVE YOU A POWER CELL.")
+  )
+
+("bird-lady-beach-resolution"
+  (30 "BIRDWATCHER" "OH MY, I HOPE THE POOR DEAR'S OKAY. HERE'S A POWER CELL FOR YOUR VALOR.")
+  (243)
+  (306 "FLUT FLUT" "MAMA!")
+  (354)
+  (406 "FLUT FLUT" "MAMA!")
+  (430 "DAXTER" "OH NO! NO, NO, NO, NO!")
+  (533)
+  (535 "BIRDWATCHER" "LOOK... ISN'T THAT CUTE? IT THINKS YOU'RE ITS MAMA.")
+  (696)
+  (699 "DAXTER" "EH? I'M NOT YOUR MOM! YOU SEE ANY FEATHERS HERE?")
+  (803)
+  (807 "BIRDWATCHER" "OH, LOVE AT FIRST SIGHT! AH...")
+  (936)
+  (939 "BIRDWATCHER" "LISTEN, BOYS, I'LL TAKE THIS LITTLE CHICK BACK TO THE VILLAGE WITH ME")
+  (1054 "BIRDWATCHER" "AND WORK WITH THE SAGE TO TAKE CARE OF HER.")
+  )
+
+
+;; -----------------
+;; jungle
+
+
+("FIS-AM01" :hint 0 (0 "FISHERMAN" "GRR, THESE DARN FISH... I NEVER CATCH ME A SINGLE ONE."))
+("FIS-AM02" :hint 0 (0 "FISHERMAN" "THEM MONSTERS THAT DONE BIT ME SHIP WILL DRIVE ME BROKE."))
+("FIS-AM03" :hint 0
+  (0 "FISHERMAN" "DRAT, THESE BLIGHTERS!")
+  (135 "FISHERMAN" "IN ME BASKET, DARN FISHIES, COME ON YEAH...")
+  (419)
+  (425 "FISHERMAN" "HEH HE HE HE HE...")
+  )
+("FIS-AM04" :hint 0 (0 "FISHERMAN" "OH I LOVE THE SMELL OF FISH IN THE MORNIN'."))
+("FIS-AM05" :hint 0 (0 "FISHERMAN" "OOH I COULD USE ME A SALTED FISH LIPS ON RYE."))
+("FIS-AM06" :hint 0 (0 "FISHERMAN" "I 'MEMBER THE BIG ONE THAT GOT AWAY..."))
+("FIS-LO01" :hint 0 (0 "FISHERMAN" "GRR!"))
+("FIS-LO03" :hint 0 (0 "FISHERMAN" "HA HA HA HA HA HAH!"))
+("FIS-LO04" :hint 0 (0 "FISHERMAN" "DARN FISH... THEY NEVER GET IN ME NET!"))
+("FIS-LO05" :hint 0 (0 "FISHERMAN" "HA HA HA AH HA HA HA HAH!"))
+("FIS-TA01" :hint 0 (0 "FISHERMAN" "TO THE LEFT!"))
+("FIS-TA02" :hint 0 (0 "FISHERMAN" "RIGHT WITH YA!"))
+("FIS-TA1A" :hint 0 (0 "FISHERMAN" "LEFT!"))
+("FIS-TA2A" :hint 0 (0 "FISHERMAN" "RIGHT!"))
+("FIS-TA03" :hint 0 (0 "FISHERMAN" "HERE COMES A BIG ONE!"))
+("FIS-TA04" :hint 0 (0 "FISHERMAN" "YE MISSED A JUMBO, LADDIE!"))
+("FIS-TA05" :hint 0 (0 "FISHERMAN" "DON'T MISS ONE LIKE THAT AGAIN!"))
+("FIS-TA06" :hint 0 (0 "FISHERMAN" "STEADY BOY."))
+("FIS-TA07" :hint 0 (0 "FISHERMAN" "YOUR SAILS ARE SAGGING IN THE WIND, BOY."))
+("FIS-TA08" :hint 0 (0 "FISHERMAN" "MISSED."))
+("FIS-TA09" :hint 0 (0 "FISHERMAN" "LOOKS LIKE YOU COULD USE A BIGGER NET..."))
+("FIS-TA10" :hint 0 (0 "FISHERMAN" "MISSED AGAIN!"))
+("FIS-TA11" :hint 0 (0 "FISHERMAN" "HOLD STEADY! YOU'RE ALMOST THERE..."))
+
+
+("sksp0038" :hint #x23c
+  (0 "DAXTER" "HMM, IF BLUE ECO CAN BUILD A BRIDGE, THEN I BET IT'LL OPEN A DOOR!")
+  (275)
+  (281 "DAXTER" "LET'S GO BACK AND GET YOU JUICED UP AGAIN.")
+  )
+("sksp0040" :hint #x23d (0 "DAXTER" "LET'S GET UP ON THAT MACHINE AND BREAK THE MIRROR DIVERTING THE PRECURSOR BEAM!"))
+("sksp0041" :hint #x23e (0 "DAXTER" "WE NEED TO GET TO THE TOP OF THAT TOWER!"))
+("sksp0011" :hint #x240
+  (0 "DAXTER" "WE SHOULD ASK THE FISHERMAN DOWN BY THE JUNGLE RIVER")
+  (136 "DAXTER" "IF WE CAN BORROW HIS SPEEDBOAT TO ZOOM ON OVER TO MISTY ISLAND!")
+  )
+("sksp0039" :hint #x25b
+  (0 "DAXTER" "HEY, THERE'S LITTLE LIGHTNING MARKS ON THOSE POSTS")
+  (202 "DAXTER" "AND THERE'S LIGHTNING COMING OUT OF THAT VENT OVER THERE.")
+  (391)
+  (400 "DAXTER" "ARE YOU THINKING WHAT I'M THINKING?")
+  )
+("sksp0018" :hint #x25e
+  (0 "DAXTER" "WE SHOULD GO TELL THAT WINDBAG OF A MAYOR THAT HE OWES US BIG TIME")
+  (223 "DAXTER" "FOR CONNECTING THE VILLAGE ENERGY BEAM!")
+  )
+("sksp0037" :hint #x25f
+  (0 "DAXTER" "THOSE TOWER DOOHICKEYS SCATTERED ALL OVER THE JUNGLE MUST REDIRECT THE ECO BEAM.")
+  (214)
+  (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."))
+("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.")
+  )
+("sksp0049" :hint #x29c (0 "DAXTER" "LINE UP THE BEAM BY POINTING IT AT THE NEXT TOWER!"))
+("sksp0050" :hint #x29d (0 "DAXTER" "BREAK THE MIRROR, JAK!"))
+("sksp0051" :hint #x29e (0 "DAXTER" "GET THE BUGS, JAK! GET THE BUGS!"))
+("sksp0052" :hint #x29f (0 "DAXTER" "LET'S GO TO THE NEXT TOWER AND RECONNECT THE BEAM THERE!"))
+("sksp0053" :hint #x2a0 (0 "DAXTER" "HEY! WE CAN FOLLOW THE BEAM TO FIND THE NEXT TOWER."))
+("sksp0054" :hint #x2a1 (0 "DAXTER" "WE NEED TO CHARGE YOU UP WITH THAT BLUE STUFF TO GET THIS OPEN!"))
+
+
+("fisher-introduction"
+  (0 "DAXTER" "WHAT DO YOU HAVE IN THE BASKET?")
+  (50 "FISHERMAN" "NOTHING TO TALK ABOUT.")
+  (103)
+  (106 "FISHERMAN" "THEM MONSTERS PATROLIN' THE OCEAN TOOK A BITE OUT OF ME FISHIN' RIG.")
+  (226)
+  (229 "FISHERMAN" "AND NOW THEY'RE GOBLIN' UP ME CATCH!")
+  (290)
+  (293 "FISHERMAN" "NO MATTER WHAT I TRY, I CAN'T SEEM TO CATCH A SINGLE FISH IN THIS RIVER.")
+  (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!")
+  (665)
+  (671 "FISHERMAN" "I'LL GIVE YOU A POWER CELL 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.")
+  (955)
+  (961 "FISHERMAN" "YOU'S WANT TO TRY THE CHALLENGE?")
+  )
+
+("fisher-reminder-1"
+  (6 "FISHERMAN" "WANT TO TRY AND BEAT THE RIVER, DO YA?")
+  )
+
+("fisher-reject"
+  (2 "FISHERMAN" "WELL, IF YOU WANT TO TRY FOR THE POWER CELL SOMETIME, YOU KNOW WHERE TO FIND ME.")
+  )
+
+("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!")
+  (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!")
+  )
+
+("fisher-resolution"
+  (0 "FISHERMAN" "YOU DID IT! YOU CAUGHT 200 POUNDS OF FISH!")
+  (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")
+  (351 "FISHERMAN" "WHENEVER YOU LIKE!")
+  )
+
+
 ;; -----------------
 ;; misty
 
@@ -409,8 +785,8 @@
 ("sagevb02" :hint #x28a
   (6 "SAGE" "I HAVE TO ADMIT, I'M IMPRESSED. YOU TWO DIDN'T SCREW UP!")
   (385)
-  (399 "SAGE" "NOW THAT THE LURKERS CAN'T OPEN THAT SILO, THEY CAN'T FLOOD THE WORLD WITH DARK ECO")
-  (720 "SAGE" "AND CAUSE UNTOLD DESTRUCTION.")
+  (400 "SAGE" "NOW THAT THE LURKERS CAN'T OPEN THAT SILO, THEY CAN'T FLOOD THE WORLD WITH DARK ECO")
+  (710 "SAGE" "AND CAUSE UNTOLD DESTRUCTION.")
   (863)
   (880 "SAGE" "WIPE THAT RIDICULOUS GRIN OFF YOUR FACE, DAXTER! THE TWO OF YOU HAVE PLENTY TO DO.")
   (1191 "SAGE" "GET ON WITH IT!")
@@ -425,6 +801,71 @@
 ("sksp0435" :hint #x2aa (0 "DAXTER" "KNOCK OVER THOSE BONES!"))
 
 
+;; -----------------
+;; firecanyon
+
+
+("asstvb09" :hint #x24f
+  (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.")
+  )
+
+("sksp0076" :hint #x501 (0 "DAXTER" "JAK, HIT SOME JUMPS TO KEEP US OFF THE HOT GROUND!"))
+("sksp0077" :hint #x502 (0 "DAXTER" "BALLOONS GOOD, BURNING HOT MAGMA BAD!"))
+("sksp0078" :hint #x503 (0 "DAXTER" "RIDE ON THE RAISED PRECURSOR STUFF TO KEEP US COOL."))
+("sksp0079" :hint #x504
+  (0 "DAXTER" "AHH! I'M GONNA DIE! I'M A COMING, GRANDPAP!")
+  (257)
+  (270 "DAXTER" "YOU HAVE TO GET THIS THING TO THE OTHER SIDE BEFORE IT OVERHEATS!")
+  )
+("sksp0080" :hint #x505 (0 "DAXTER" "USE THE HOP-TURN TO STEER HARDER!"))
+("sksp0081" :hint #x506 (0 "DAXTER" "AHH! MAYBE I SHOULD DRIVE!"))
+("sksp0082" :hint #x507 (0 "DAXTER" "YOU ARE TRYING TO AVOID THOSE DARK ECO BOXES, RIGHT?"))
+("sksp0083" :hint #x508 (0 "DAXTER" "OOH! SEE IF WE CAN CATCH AIR OFF THOSE LURKERS!"))
+("sksp0084" :hint #x509 (0 "DAXTER" "TOO CLOSE, TOO CLOSE!"))
+("sksp0085" :hint #x50a (0 "DAXTER" "WHOA! THIS BABY'S GETTING WAY TOO HOT!"))
+("sksp0086" :hint #x50b (0 "DAXTER" "A FEW MORE SECONDS AND WE'RE FRIED FLUT FLUT!"))
+
+("sksp0087" :hint #x50d (0 "DAXTER" "HIT THOSE BALLOONS TO COOL OFF!"))
+("sksp0088" :hint #x50e (0 "DAXTER" "HERE COMES ANOTHER BALLOON!"))
+("sksp0089" :hint #x50f (0 "DAXTER" "I WISH I SLEPT IN THIS MORNING!"))
+("sksp0090" :hint #x510 (0 "DAXTER" "YOU MISSED A BALLOON! WE NEED THOSE OR WE'RE COOKED!"))
+("sksp0091" :hint #x511 (0 "DAXTER" "THIS PUPPY'S GETTING TOO HOT!"))
+("sksp0092" :hint #x512 (0 "DAXTER" "DO YOU SMELL SOMETHING BURNING?!"))
+("sksp0093" :hint #x513 (0 "DAXTER" "I THINK MY TAIL'S ON FIRE!"))
+("sksp0094" :hint #x514 (0 "DAXTER" "SHE'S GONNA BLOW!"))
+("sksp0095" :hint #x515 (0 "DAXTER" "WAHOO! WE MADE IT!"))
+("sksp0096" :hint #x516 (0 "DAXTER" "THERE'S SCOUT FLIES OUT HERE, TOO!"))
+
+
+("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.")
+  (343)
+  (346 :offscreen "KEIRA" "FLYING OVER OPEN LAVA WILL DEFINITELY HEAT YOU UP FAST.")
+  (458)
+  (462 "KEIRA" "HIT 500 DEGREES, AND IT'S OVER.")
+  (546)
+  (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.")
+  (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.")
+  (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.")
+  (1140)
+  (1146 "KEIRA" "THEN WE'LL BE ABLE TO TELEPORT OVER AND MEET YOU!")
+  (1222)
+  (1228 "KEIRA" "GOOD LUCK!")
+  )
+
+
 ;; -----------------
 ;; swamp
 
@@ -483,12 +924,12 @@
 ("redsage-resolution"
   (58 "RED SAGE" "(CHUCKLES) YOU'VE FINALLY COME TO RESCUE ME.")
   (190 "RED SAGE" "DO YOU KNOW HOW LONG I'VE BEEN IN HERE? WHAT TOOK YOU SO LONG? AND UH... (CHUCKLES)")
-  (381 "RED SAGE" "WHAT ARE YOUR NAMES?")
+  (378 "RED SAGE" "WHAT ARE YOUR NAMES?")
   (429)
   (432 "DAXTER" "I'M DAXTER! HE'S JAK, HE'S WITH ME.")
   (540 :offscreen "RED SAGE" "GOOD JOB, DAXTER. YOU'RE A REAL HERO.")
-  (674)
-  (700 "RED SAGE" "YOU'VE GOT TO STOP GOL FROM LAUNCHING THE ROBOT.")
+  (677)
+  (703 "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.")
   )
 
@@ -521,7 +962,7 @@
   (405 "DAXTER" "YEAH YEAH THAT SOUNDS LIKE A GOOD START.")
   (457 "DAXTER" "AND THEN AFTER YOU GUYS OPEN THAT SHIELD, WHAT ARE YOU GONNA DO ABOUT THE ROBOT?")
   (576 "SAGE" "NOTHING, DAXTER. WE HAVE TO KEEP THE SHIELD OPEN.")
-  (704 "SAGE" "IT'S UP TO YOU TWO TO FIGURE OUT HOW TO DESTROY THE ROBOT.")
+  (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!")
   (1111)

game/assets/jak1/text/game_text_en.gs

@@ -99,10 +99,10 @@
         "SUBTITLES")
 (#x1079 "HINT SUBTITLES"
         "HINT SUBTITLES")
-(#x107a "SUBTITLES LANGUAGE"
-        "SUBTITLES LANGUAGE")
-(#x107b "SUBTITLES SPEAKER"
-        "SUBTITLES SPEAKER")
+(#x107a "SUBTITLE LANGUAGE"
+        "SUBTITLE LANGUAGE")
+(#x107b "SHOW SPEAKER IN SUBTITLE"
+        "SHOW SPEAKER IN SUBTITLE")
 (#x107c "ALWAYS"
         "ALWAYS")
 (#x107d "NEVER"

game/overlord/iso_queue.cpp

@@ -160,7 +160,7 @@ void FreeBuffer(IsoBufferHeader* buffer) {
 void DisplayQueue() {
   for (int pri = 0; pri < N_PRIORITIES; pri++) {
     for (int cmd = 0; cmd < (int)gPriStack[pri].n; cmd++) {
-      lg::debug("  PRI {} elt {} {}\n", pri, cmd, gPriStack[pri].names[cmd]);
+      lg::debug("  PRI {} elt {} {}", pri, cmd, gPriStack[pri].names[cmd]);
     }
   }
 }

goal_src/pc/subtitle.gc

@@ -21,7 +21,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(defconstant PC_SUBTITLE_FILE_SIZE (* 64 1024)) ;; 64K heap for subtitles. adjust later if necessary.
+(defconstant PC_SUBTITLE_FILE_SIZE (* 128 1024)) ;; 128K heap for subtitles. adjust later if necessary.
 (defconstant PC_SUBTITLE_FILE_NAME "subtit")
 (defconstant PC_SUBTITLE_STR_ADJUST 17)
 (defglobalconstant PC_SUBTITLE_DEBUG #f)
@@ -125,7 +125,7 @@
     (new 'static 'subtitle-bank
                   :scale 0.49
                   :width 0.87
-                  :height 0.82
+                  :height 0.835
                   :lines 2.0
                   ))