mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-21 23:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

separate language settings into 3 settings/options (#1636)

Browse Source 
* only show subtitle notices during a subtitle context

* move language & subtitles (back) to game options

* remove "accessibility" menu and put its option in "misc"

* new subtitle language selection

* properly split audio & text language

* Update game_text_en.gs

* misc setting size fixes

* better fix for subtitle notice

* final touches

* subtitle fixes & uk-english subtitles

* more english fixes
This commit is contained in:
ManDude
2022-07-12 23:00:52 +01:00
committed by GitHub
parent 88166300a9
commit 163e86130f
14 changed files with 586 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/config/all-types.gc
+9
View File
@@ -1476,6 +1476,7 @@
(subtitle-hint #x103f)
(subtitle-enabled #x1040)
(subtitle-disabled #x1041)
(text-language #x1042)
(msaa #x1050)
(x-times-fmt #x1051)
(2-times #x1052)
@@ -1580,6 +1581,13 @@
(flava-fin-end #x1105)
(flava-credits-middle #x1106)
(flava-credits-end #x1107)
(uk-english #x1110)
(portuguese #x1111)
(br-portuguese #x1112)
(finnish #x1113)
(swedish #x1114)
(danish #x1115)
(norwegian #x1116)
(scene-0 #x1200)
(scene-255 #x12ff)
(hint-0 #x1300)
@@ -15751,6 +15759,7 @@
(resolution)
(aspect-new)
(language-subtitles)
(language-text)
(speaker)
(aspect-native)
(button-music)
game/assets/game_subtitle.gp
+1
View File
@@ -5,6 +5,7 @@
(subtitle
(file "game/assets/jak1/subtitle/game_subtitle_en.gd")
(file "game/assets/jak1/subtitle/game_subtitle_en-uk.gd")
(file "game/assets/jak1/subtitle/game_subtitle_es.gd")
)
game/assets/jak1/subtitle/game_subtitle_en-uk.gd
+355
View File
@@ -0,0 +1,355 @@
(language-id 6)
(text-version jak1-v2)
;; -----------------
;; intro
;; -----------------
("sidekick-human-intro-sequence-b"
(547 "OLD MAN" "CONTINUE YOUR SEARCH FOR ARTEFACTS AND ECO.")
(664)
(674 "OLD MAN" "IF THE LOCALS POSSESS PRECURSOR ITEMS, YOU KNOW WHAT TO DO.")
(819)
(839 "WOMAN" "DEAL HARSHLY WITH ANYBODY WHO STRAYS FROM THE VILLAGE.")
(937 "WOMAN" "WE WILL ATTACK IT IN DUE TIME.")
(1027)
)
;; -----------------
;; sidekick
;; -----------------
("sksp009c" :hint #x28f (0 "DAXTER" "DO ME A FAVOUR AND KEEP AWAY FROM THOSE DARK ECO BOXES!"))
;; -----------------
;; oracle
;; -----------------
;; -----------------
;; training
;; -----------------
("asstvb42" :hint #x902
(0 "KEIRA" "THIS IS A POWER CELL, THE MOST IMPORTANT PRECURSOR ARTEFACT YOU CAN FIND!")
(327)
(333 "KEIRA" "YOU NEED TO COLLECT 20 OF THESE SO I CAN POWER THE HEAT SHIELD")
(507 "KEIRA" "FOR YOUR A-GRAV ZOOMER.")
)
("sagevb22" :hint #x909
(0 "SAGE" "THAT'S BLUE ECO, WHICH CONTAINS THE ENERGY OF MOTION.")
(291 "SAGE" "BLUE ECO ALLOWS YOU TO RUN FAST, BREAK BOXES, AND EVEN ACTIVATE SOME PRECURSOR")
(640 "SAGE" "ARTEFACTS WHEN YOU GET NEAR THEM.")
)
("sagevb25" :hint #x90c
(3 "SAGE" "GOOD WORK, THE BLUE ECO CAUSED THE DOOR TO OPEN. WITH BLUE ECO, YOU CAN BREATHE")
(365 "SAGE" "ENERGY INTO ALL KINDS OF PRECURSOR ARTEFACTS THAT HAVE LAIN DORMANT FOR YEARS.")
)
;; -----------------
;; village1
;; -----------------
;; -----------------
;; beach
;; -----------------
("bird-lady-beach-resolution"
(30 "BIRDWATCHER" "OH MY, I HOPE THE POOR DEAR'S OKAY. HERE'S A POWER CELL FOR YOUR VALOUR.")
(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.")
)
("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!")
(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.")
(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.")
(1041)
(1044 "BIRDWATCHER" "DO AN OLD LADY A FAVOUR, AND I'LL GIVE YOU A POWER CELL.")
(1198)
)
;; -----------------
;; jungle
;; -----------------
;; -----------------
;; misty
;; -----------------
;; -----------------
;; firecanyon
;; -----------------
;; -----------------
;; village2
;; -----------------
("sage-bluehut-introduction-prec-arm"
(0 "SAGE" "WELL, I HOPE YOU'VE PACKED A LUNCH.'CAUSE WE'RE JUST GETTING STARTED.")
(130)
(140 "SAGE" "ACCORDING TO THE BLUE SAGE'S NOTES,")
(208 "SAGE" "LURKERS HAVE INFESTED THE SWAMP ACROSS THE BAY.")
(300)
(304 :offscreen "SAGE" "APPARENTLY, THEY'RE PLANNING TO USE A DIRIGIBLE")
(417 :offscreen "SAGE" "TO LIFT AN IMPORTANT PRECURSOR ARTEFACT FROM THE MUCK.")
(531)
(549 :offscreen "SAGE" "YOU'RE GOING TO HAVE TO GET OVER THERE TO DISLODGE THEIR TETHERS.")
(675)
(685 "SAGE" "WHO KNOWS WHAT THEY MIGHT WANT WITH THE ARTEFACT,")
(764 "SAGE" "BUT LIKE ORANGE STUFF HERE'S BREATH, IT JUST CAN'T BE GOOD.")
)
("warrior-introduction"
(24 "WARRIOR" "OHH... MY ACHING HEAD.")
(128)
(137 "DAXTER" "I DOUBT THAT'S ONE OF YOUR VITAL ORGANS!")
(212 "DAXTER" "WALK IT OFF, TOUGH GUY!")
(264 "WARRIOR" "OH, SURE, I WAS TOUGH ONCE.")
(337 "WARRIOR" "MAYBE EVEN THE TOUGHEST OF THEM ALL.")
(402 "WARRIOR" "I SINGLE-HANDEDLY DEFENDED THIS VILLAGE FROM THOSE HORRID CREATURES FOR ALMOST A YEAR!")
(594 :offscreen "WARRIOR" "THEN THAT HORRIBLE MONSTER ARRIVED AND COMMENCED THE BOULDER BOMBARDMENT.")
(760 :offscreen "WARRIOR" "SO, FULL OF VALOUR, ARMOR SHINING IN THE SUN...")
(928 "WARRIOR" "I CLIMBED THE HILL TO TAKE HIM ON...!")
(1033)
(1044 "WARRIOR" "BUT HE POUNDED ME LIKE ONE TENDERIZES A YAKOW STEAK.")
(1172)
(1178 "DAXTER" "HAVE YOU TRIED ATTACKING HIM WITH YOUR MELODRAMA?")
(1255 "DAXTER" "'CAUSE IT'S KILLIN' ME!")
(1303)
(1310 :offscreen "WARRIOR" "AFTER MY LAST STUNNING FAILURE,")
(1395 :offscreen "WARRIOR" "HE SEALED THE PASSAGEWAY TO HIS ROOST WITH A 30-TON BOULDER,")
(1515 :offscreen "WARRIOR" "LEAVING NO WAY FOR ANYONE TO CHALLENGE HIM AGAIN.")
(1640)
(1669 "WARRIOR" "SO, OUR SAGE, A MASTER OF BLUE ECO AND A MECHANICAL GENIUS, DEVISED A MACHINE")
(1905 "WARRIOR" "CAPABLE OF LIFTING THE BOULDER OUT OF THE WAY...!")
(2030)
(2040 "WARRIOR" "BUT ALAS, HE DISAPPEARED BEFORE WE HAD A CHANCE TO TURN IT ON.")
(2200)
(2222 "WARRIOR" "AND HE TOOK ALL OF HIS POWER CELLS WITH HIM.")
(2330)
(2360 :offscreen "WARRIOR" "AT LEAST I WAS ABLE TO PULL ENOUGH PONTOONS OUT OF OUR BRIDGE TO PREVENT")
(2465 :offscreen "WARRIOR" "THAT MONSTER FROM COMING DOWN HERE TO DO ME HARM.")
(2561)
(2566 "DAXTER" "YEAH, GOOD, GOOD JOB, TOUGH GUY. BUT, UM...")
(2659 "DAXTER" "WE'RE GONNA NEED YOU TO, UH... PUT 'EM BACK, AND STUFF.")
(2766)
(2770 "WARRIOR" "OH, SURE! AND SEAL MY DOOM?")
(2880 "WARRIOR" "(SIGHS)")
(2943)
(2949 "WARRIOR" "ALRIGHT. FINE.")
(3036 "WARRIOR" "BRING ME 90 PRECURSOR ORBS AND I'LL LET THE PONTOONS LOOSE.")
(3173)
(3197 "WARRIOR" "BUT I'M NOT GOING TO FIGHT THAT MONSTER AGAIN!")
)
;; -----------------
;; swamp
;; -----------------
("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...")
(349)
(369 "DAXTER" "JUDGING BY THE SMELL, I'D WAGER YOUR BATHTUB SANK IN THE MUD LONG AGO.")
(497)
(519 "BILLY" "WHAT'S A BATHTUB? 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.")
(910 "BILLY" "AND SCARIN' AWAY MY PET HIPHOG, FARTHY.")
(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 FAVOURITE SNACK, 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?")
)
("sksp0153" :hint #x361
(0 "DAXTER" "HEY, THAT MUST BE THE PRECURSOR ARTEFACT THE LURKERS ARE AFTER!")
(175 "DAXTER" "IT LOOKS LIKE A GIANT ROBOT ARM!")
)
;; -----------------
;; rolling
;; -----------------
;; -----------------
;; sunken
;; -----------------
("sksp0135" :hint #x34f (0 "DAXTER" "THAT WATER LOOKS DANGEROUS WHEN IT CHANGES COLOUR!"))
("sksp0136" :hint #x350 (0 "DAXTER" "YOU GOTTA GET OUT OF THE WATER BEFORE IT CHANGES COLOUR!"))
;; -----------------
;; ogre
;; -----------------
;; -----------------
;; village3
;; -----------------
("minershort-introduction-gnawers"
(5 "GORDY" "WHY DON'T YOU TWO MAKE YOURSELVES USEFUL?")
(89 "GORDY" "LURKERS HAVE BEEN EXCAVATIN' THE DARK CAVES OVER THERE.")
(191 :offscreen "GORDY" "SEEMS THEY'RE LOOKIN' FOR PRECURSOR ARTEFACTS.")
(265)
(271 :offscreen "GORDY" "THEY CAN HAVE THE ARTEFACTS, FOR ALL I CARE.")
(357)
(360 :offscreen "WILLARD" "FOR ALL WE CARE!")
(441)
(444 "GORDY" "WILLARD, FEED YOUR BIRD.")
(490)
(496 "GORDY" "ALL I CARE ABOUT ARE GEMS!")
(566 "GORDY" "BUT I AIN'T GONNA BE ABLE TO GET THE CAVE'S GEMS")
(625 "GORDY" "BECAUSE WHEN THEY'RE THROUGH, THEY'RE GONNA COLLAPSE THE PLACE!")
(715)
(721 "GORDY" "IF YOU TAKE OUT THE LURKERS CHEWIN' AT THE SUPPORT BEAMS,")
(827 "GORDY" "YOU COULD SAVE THE CAVE FOR ME.")
(875)
(884 "GORDY" "NOW BEAT IT!")
)
("sage-village3-introduction"
(6 "SAGE" "OW! I ALWAYS WONDER IF I'M LOSING BODY PARTS IN THOSE THINGS!")
(153)
(183 "SAGE" "HOLY YAKOW! THE RED SAGE'S LAB LOOKS WORSE THAN THE BLUE'S!")
(321)
(321 "KEIRA" "WELL, IT DEFINITELY LOOKS AS THOUGH THERE'S BEEN A STRUGGLE HERE.")
(418)
(441 "OLD MAN" "HA HA HA HA HA!")
(500)
(528 "OLD MAN" "I'D HARDLY CALL IT \"STRUGGLE.\" WOULD YOU, DEAR SISTER?")
(672 "WOMAN" "CERTAINLY NOT. THE RED SAGE GAVE UP WITH SO LITTLE EFFORT.")
(799)
(806 "WOMAN" "NO FUN AT ALL.")
(860)
(884 "SAGE" "GOL? IS THAT YOU?")
(965)
(969 "SAGE" "YOU'VE FINALLY GONE OFF THE DEEP END, EH?")
(1060 "SAGE" "AND, MAIA! I TOLD YOU THE DARK ECO WOULD AFFECT YOU BOTH!")
(1180 "SAGE" "HNG, NOBODY EVER LISTENS TO OLD SAMOS...")
(1265)
(1282 "SAGE" "WHAT HAVE YOU TWO DONE WITH THE BLUE AND RED SAGES?")
(1372 "GOL" "DON'T WORRY ABOUT YOUR COLOURFUL FRIENDS, YOU OLD FOOL.")
(1516 "GOL" "THEY'RE PERFECTLY SAFE IN OUR CITADEL. OUR SPECIAL GUESTS.")
(1680 "MAIA" "THEY HAVE GRACIOUSLY AGREED TO HELP US ON A LITTLE PROJECT.")
(1813)
(1828 "GOL" "YOU WERE WRONG, SAMOS. DARK ECO CAN BE CONTROLLED!")
(1990)
(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.")
(2508)
(2520 "MAIA" "BUT SOON, WE WILL HAVE ACCESS TO THE VAST STORES")
(2611 "MAIA" "OF DARK ECO HIDDEN DEEP UNDERGROUND.")
(2715 "SAGE" "NOT THE SILOS!")
(2758)
(2768 "GOL" "YES, THE SILOS!")
(2841 "GOL" "THEY WILL BE OPENED, AND ALL THE DARK ECO IN THE WORLD WILL BE OURS!")
(3028)
(3034 "SAGE" "BUT THAT'S IMPOSSIBLE! ONLY A PRECURSOR ROBOT-")
(3128 "MAIA" "OH, DON'T LOOK SO UPSET, SAMOS. WE'VE GOT BIG PLANS FOR YOU.")
(3300)
(3303 :offscreen "MAIA" "AH HA HA HA HA HA HA! AH...")
(3460)
(3495 "DAXTER" "WAIT A MINUTE!")
(3538)
(3541 "DAXTER" "THAT WAS GOL?")
(3586)
(3595 "DAXTER" "THE SAME GOL WHO'S SUPPOSED TO CHANGE ME BACK?")
(3690 "DAXTER" "GOL IS THE GUY TRYING TO KILL US?!")
(3772)
(3785 "DAXTER" "I'M DOOMED.")
(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!")
(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.")
(4460)
(4464 "SAGE" "ALL RIGHT, MY BOY. YOU KNOW WHAT TO DO.")
(4545 "SAGE" "TAKE THE FLEABAG AND GO ROUND UP MORE POWER CELLS.")
(4664)
)
("asstv103" :hint #x452
(0 "KEIRA" "DON'T FORGET TO TURN ON THE TELEPORT GATE TO LET US THROUGH.")
(160 "KEIRA" "YOU'VE GOT TO GO INTO THE RED SAGE'S LAB")
(280 "KEIRA" "IN THE CENTRE OF THE VOLCANIC CRATER TO TURN IT ON.")
(450 "KEIRA" "WE CAN'T COME THROUGH UNTIL IT'S BACK ONLINE.")
)
;; -----------------
;; snowy
;; -----------------
;; -----------------
;; spidercave
;; -----------------
;; -----------------
;; lavatube
;; -----------------
;; -----------------
;; citadel
;; -----------------
("green-sagecage-introduction"
(130 "SAGE" "IT'S ABOUT TIME YOU TWO DECIDED TO SHOW UP!")
(207 "DAXTER" "NICE TO SEE YOU TOO! DO THEY HAVE YOU MOPPING THE FLOORS NOW?")
(343 "SAGE" "THERE'S NO TIME FOR JOKES, DAXTER. GOL AND MAIA KIDNAPPED US")
(477 "SAGE" "TO SAP OUR ENERGIES TO POWER THEIR ABOMINABLE MACHINE.")
(574)
(584 :offscreen "SAGE" "IT APPEARS THEY HAVE COMBINED THE FUNCTIONAL REMAINS OF A PRECURSOR ROBOT")
(710 :offscreen "SAGE" "WITH SCAVENGED ARTEFACTS FROM ACROSS THE LAND.")
(800)
(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.")
)
;; -----------------
;; finalboss
;; -----------------
;; -----------------
;; title
;; -----------------
;; -----------------
;; uncategorized
;; -----------------
game/assets/jak1/subtitle/game_subtitle_en.gd
+8 -8
View File
@@ -196,7 +196,7 @@
("death-0197"
(0 "DAXTER" "HEIMLICH! UH... STRETCHER!")
(62)
(72 "DAXTER" "YUCK... BREATHMINT?")
(72 "DAXTER" "YUCK... BREATH MINT?")
)
("death-0199"
@@ -350,7 +350,7 @@
("sagevb24" :hint #x90b
(3 "SAGE" "THIS IS A PRECURSOR DOOR. IT CAN ONLY BE OPENED BY APPROACHING THE DOOR")
(357 "SAGE" "WHILE CHANNELING BLUE ECO THROUGH YOUR BODY.")
(357 "SAGE" "WHILE CHANNELLING BLUE ECO THROUGH YOUR BODY.")
)
("sagevb25" :hint #x90c
@@ -450,7 +450,7 @@
)
("explorer-reminder-1"
(25 "JAK'S UNCLE" "WHAT? YOU DON'T HAVE THE FULL STASH? HARUMPH!")
(25 "JAK'S UNCLE" "WHAT? YOU DON'T HAVE THE FULL STASH? HARRUMPH!")
(148 "JAK'S UNCLE" "WELL, ANY LESS THAN 90 PRECURSOR ORBS")
(251 "JAK'S UNCLE" "AND I SHAN'T HAVE A CHANCE TO GET UNDERWAY, DEAR BOY.")
(387)
@@ -470,7 +470,7 @@
("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")
(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.")
(454)
(456 "FARMER" "YOU THINK YOU CAN HELP AN OLD MAN TRY TO GET 'EM BACK INTO THE CORRAL?")
@@ -1476,9 +1476,9 @@
)
("asstvb21" :hint #x328
(0 "KEIRA" "GOOD WORK! AREN'T YOU GUYS HAPPY YOU SAVED OUR LITTLE FLUT-FLUT FRIEND?")
(314 "KEIRA" "SHE MAY COME IN HANDY AGAIN SOMETIME.")
(450 "KEIRA" "NOW, GO BACK TO THE TRANS-PAD, AND I'LL BRING HER HOME.")
(50 "KEIRA" "GOOD WORK! AREN'T YOU GUYS HAPPY 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.")
)
("sagevb03" :hint #x36a
@@ -2325,7 +2325,7 @@
(845)
(847 "DAXTER" "DON'T WORRY ABOUT ME, BABY. YOU KNOW WHAT THEY SAY: BIG THINGS COME IN SMALL PACKAGES.")
(1096)
(1104 "BLUE SAGE" "JAK, YOU HAVE AN INCREDIBLE TALENT FOR CHANNELING ECO!")
(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)
game/assets/jak1/text/game_text_en.gs
+17
View File
@@ -98,6 +98,8 @@
"SUBTITLES ENABLED")
(#x1041 "SUBTITLES DISABLED"
"SUBTITLES DISABLED")
(#x1042 "TEXT LANGUAGE"
"TEXT LANGUAGE")
(#x1050 "MSAA"
"MSAA")
@@ -311,6 +313,21 @@
(#x1107 "FLAVOR 2"
"FLAVOUR 2")
(#x1110 "ENGLISH (UK)"
"ENGLISH (UK)")
(#x1111 "PORTUGUÊS"
"PORTUGUÊS")
(#x1112 "PORTUGUÊS (BRASIL)"
"PORTUGUÊS (BRASIL)")
(#x1113 "SUOMI"
"SUOMI")
(#x1114 "SVENSKA"
"SVENSKA")
(#x1115 "DANSK"
"DANSK")
(#x1116 "NORSK"
"NORSK")
;; -----------------
;; test
goal_src/goal-lib.gc
+10
View File
@@ -495,6 +495,16 @@
`(case ,switch ,@cases :comp string=)
)
(defmacro dolist (bindings &rest body)
`(let ((,(car bindings) ,(cadr bindings)))
(while (not (null? ,(car bindings)))
,@body
(set! ,(car bindings) (cdr ,(car bindings)))
)
)
)
;;;;;;;;;;;;;;;;;;;
;; Math Macros
;;;;;;;;;;;;;;;;;;;
goal_src/jak1/engine/ui/progress/progress-h.gc
+1
View File
@@ -149,6 +149,7 @@
(resolution)
(aspect-new)
(language-subtitles)
(language-text)
(speaker)
(aspect-native)
(button-music)
goal_src/jak1/engine/ui/text-h.gc
+8
View File
@@ -626,6 +626,7 @@
(subtitle-hint #x103f)
(subtitle-enabled #x1040)
(subtitle-disabled #x1041)
(text-language #x1042)
(msaa #x1050)
(x-times-fmt #x1051)
(2-times #x1052)
@@ -730,6 +731,13 @@
(flava-fin-end #x1105)
(flava-credits-middle #x1106)
(flava-credits-end #x1107)
(uk-english #x1110)
(portuguese #x1111)
(br-portuguese #x1112)
(finnish #x1113)
(swedish #x1114)
(danish #x1115)
(norwegian #x1116)
(scene-0 #x1200)
(scene-255 #x12ff)
(hint-0 #x1300)
goal_src/jak1/engine/ui/text.gc
+63 -103
View File
@@ -144,10 +144,12 @@
(heap-free int)
)
(set! heap-sym-heap (the-as game-text-info (-> curr-text value)))
(set! lang (-> *setting-control* current language))
;; split languages in PC port
(set! lang (#if PC_PORT (the language-enum (-> *pc-settings* text-language))
(-> *setting-control* current language)))
(set! load-status 0)
(set! heap-free (&- (-> heap top) (the-as uint (-> heap base))))
;; english -> UK english in PAL (I think?)
;; english -> UK english in PAL
(if (and (= (scf-get-territory) GAME_TERRITORY_SCEE) (= lang (language-enum english)))
(set! lang (language-enum uk-english))
)
@@ -249,108 +251,66 @@
(let ((s5-0 (new 'static 'vector4w))
(gp-0 (new 'static 'matrix))
)
(let ((s4-0 (new 'static 'vector)))
(set-vector! s4-0 (-> arg0 origin x) (-> arg0 origin y) 0.0 1.0)
(set!
(-> s4-0 x)
(* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical))
)
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 0)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector!
s4-0
(+ (-> arg0 origin x) (-> arg0 width))
(-> arg0 origin y)
0.0
1.0
)
(set!
(-> s4-0 x)
(* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical))
)
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 1)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector!
s4-0
(+ (-> arg0 origin x) (-> arg0 width))
(+ (-> arg0 origin y) (-> arg0 height))
0.0
1.0
)
(set!
(-> s4-0 x)
(* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical))
)
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 2)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector!
s4-0
(-> arg0 origin x)
(+ (-> arg0 origin y) (-> arg0 height))
0.0
1.0
)
(set!
(-> s4-0 x)
(* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical))
)
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 3)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(let ((s4-0 (new 'static 'vector)))
(set-vector! s4-0 (-> arg0 origin x) (-> arg0 origin y) 0.0 1.0)
(set! (-> s4-0 x) (* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical)))
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 0)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector! s4-0 (+ (-> arg0 origin x) (-> arg0 width)) (-> arg0 origin y) 0.0 1.0)
(set! (-> s4-0 x) (* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical)))
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 1)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector! s4-0 (+ (-> arg0 origin x) (-> arg0 width)) (+ (-> arg0 origin y) (-> arg0 height)) 0.0 1.0)
(set! (-> s4-0 x) (* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical)))
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 2)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
(set-vector! s4-0 (-> arg0 origin x) (+ (-> arg0 origin y) (-> arg0 height)) 0.0 1.0)
(set! (-> s4-0 x) (* (-> s4-0 x) (-> *video-parms* relative-x-scale-reciprical)))
(vector-matrix*! s4-0 s4-0 (-> arg0 mat))
(set-vector!
(-> gp-0 vector 3)
(the-as float (the int (-> s4-0 x)))
(the-as float (the int (-> s4-0 y)))
(the-as float (the int (-> s4-0 z)))
(the-as float 1)
)
)
(set-vector! s5-0 128 128 128 128)
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(the-as vector (-> gp-0 vector))
(-> gp-0 vector 1)
(the-as vector s5-0)
)
(add-debug-line2d #t (bucket-id debug-no-zbuf) (-> gp-0 vector 1) (-> gp-0 vector 2) (the-as vector s5-0))
(add-debug-line2d #t (bucket-id debug-no-zbuf) (-> gp-0 vector 2) (-> gp-0 vector 3) (the-as vector s5-0))
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(-> gp-0 vector 3)
(the-as vector (-> gp-0 vector))
(the-as vector s5-0)
)
)
(set-vector! s5-0 128 128 128 128)
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(the-as vector (-> gp-0 vector))
(-> gp-0 vector 1)
(the-as vector s5-0)
)
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(-> gp-0 vector 1)
(-> gp-0 vector 2)
(the-as vector s5-0)
)
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(-> gp-0 vector 2)
(-> gp-0 vector 3)
(the-as vector s5-0)
)
(add-debug-line2d
#t
(bucket-id debug-no-zbuf)
(-> gp-0 vector 3)
(the-as vector (-> gp-0 vector))
(the-as vector s5-0)
)
)
0
(none)
)
goal_src/jak1/kernel/gcommon.gc
+1 -1
View File
@@ -447,7 +447,7 @@
)
(defun assoc ((item object) (alist object))
"Is item in the association list alist?
"Is there an entry with key item in the association list alist?
Returns the key-value pair."
(let ((iter alist))
(while (not (or (null? iter) (= (car (car iter)) item)))
goal_src/jak1/pc/pckernel-h.gc
+6 -3
View File
@@ -29,7 +29,7 @@
(defglobalconstant PC_KERNEL_VERSION_BUILD #x0001)
(defglobalconstant PC_KERNEL_VERSION_REVISION #x0006)
(defglobalconstant PC_KERNEL_VERSION_REVISION #x0007)
(defglobalconstant PC_KERNEL_VERSION_MINOR #x0006)
(defglobalconstant PC_KERNEL_VERSION_MAJOR #x0001)
@@ -96,10 +96,12 @@
(swedish 9)
(danish 10)
(norwegian 11)
(dutch 12)
(br-portuguese 13)
;; jak 1 has no glyphs for korean or cyrillic.
(korean 12) ;; future-proofing here
(russian 13) ;; same thing
(korean 98) ;; future-proofing here
(russian 97) ;; same thing
(custom 500) ;; temp
)
@@ -279,6 +281,7 @@
(skip-movies? symbol) ;; if on, enable cutscene skipping
(subtitles? symbol) ;; if on, cutscene subtitles will show up
(hinttitles? symbol) ;; if on, non-cutscene subtitles will show up
(text-language pc-subtitle-lang) ;; language for game text
(subtitle-language pc-subtitle-lang) ;; language for subtitles
(subtitle-speaker? symbol) ;; #f (force off), #t (force on), auto (on for offscreen)
(first-camera-h-inverted? symbol) ;; first-person horizontal camera inverted
goal_src/jak1/pc/progress-pc.gc
+104 -60
View File
@@ -83,7 +83,6 @@
(def-progress-carousell *carousell-msaa* (off 2-times 4-times 8-times 16-times))
(def-progress-carousell *carousell-lod-bg* (lod-high lod-low))
(def-progress-carousell *carousell-lod-fg* (lod-high lod-low lod-ps2))
(def-progress-carousell *carousell-subtitle-language* (english french german spanish italian japanese))
(def-progress-carousell *carousell-speaker* (speaker-always speaker-never speaker-auto))
(def-progress-carousell *carousell-frame-rate-150fps* (60fps 100fps 150fps))
(def-progress-carousell *carousell-frame-rate-100fps* (60fps 100fps))
@@ -91,9 +90,9 @@
;;---------------------------
;;---------------------------
;; pc menu defines
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; MENU OPTIONS
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define *main-options-auto-save* (new 'static 'boxed-array :type game-option
@@ -111,8 +110,13 @@
(define *game-options-pc* (new 'static 'boxed-array :type game-option
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id vibrations) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id play-hints) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id subtitles) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id hinttitles) :scale #t)
(new 'static 'game-option :option-type (game-option-type language) :name (game-text-id language) :scale #t)
(new 'static 'game-option :option-type (game-option-type language-subtitles) :name (game-text-id subtitles-language) :scale #t)
(new 'static 'game-option :option-type (game-option-type language-text) :name (game-text-id text-language) :scale #t)
(new 'static 'game-option :option-type (game-option-type speaker) :name (game-text-id subtitles-speaker) :scale #t)
(new 'static 'game-option :option-type (game-option-type menu) :name (game-text-id camera-options) :scale #t :param3 (game-option-menu camera-options))
(new 'static 'game-option :option-type (game-option-type menu) :name (game-text-id accessibility-options) :scale #t :param3 (game-option-menu accessibility-options))
(new 'static 'game-option :option-type (game-option-type menu) :name (game-text-id misc-options) :scale #t :param3 (game-option-menu misc-options))
(new 'static 'game-option :option-type (game-option-type button) :name (game-text-id back) :scale #t)
)
@@ -142,6 +146,7 @@
)
(define *misc-options* (new 'static 'boxed-array :type game-option
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id money-starburst) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id discord-rpc) :scale #t)
(new 'static 'game-option :option-type (game-option-type button) :name (game-text-id back) :scale #t)
)
@@ -188,11 +193,6 @@
(new 'static 'game-option :name (game-text-id sfx-volume) :scale #t :param2 100.0)
(new 'static 'game-option :name (game-text-id music-volume) :scale #t :param2 100.0)
(new 'static 'game-option :name (game-text-id speech-volume) :scale #t :param2 100.0)
(new 'static 'game-option :option-type (game-option-type language) :name (game-text-id language) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id subtitles) :scale #t)
(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id hinttitles) :scale #t)
(new 'static 'game-option :option-type (game-option-type language-subtitles) :name (game-text-id subtitles-language) :scale #t)
(new 'static 'game-option :option-type (game-option-type speaker) :name (game-text-id subtitles-speaker) :scale #t)
;(new 'static 'game-option :option-type (game-option-type on-off) :name (game-text-id music-fadein) :scale #t)
(new 'static 'game-option :option-type (game-option-type button) :name (game-text-id back) :scale #t)
)
@@ -240,6 +240,13 @@
)
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DATA LISTS
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define *music-list* '(village1 beach jungle fishgame jungleb misty firecanyon
village2 rolling swamp sunken ogre ogreboss
village3 snow maincave lavatube
@@ -282,6 +289,24 @@
))
(defmacro def-language-remap-info (langs)
`(quote ,(apply (lambda (x) `((the binteger (game-text-id ,x)) (the binteger (pc-subtitle-lang ,x)))) langs))
)
(define *language-remap-info-pc* (def-language-remap-info
(english uk-english french german spanish italian japanese portuguese br-portuguese swedish finnish danish norwegian)))
(define *text-languages* (static-text-list-array
english uk-english french german spanish italian japanese))
(define *subtitle-languages* (static-text-list-array
english spanish))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DYNAMIC MENU THINGS
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-perm *temp-options-alloced* symbol #f)
(define *resolutions* (new 'static 'boxed-array :type int32
@@ -450,6 +475,23 @@
)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; CAROUSELL FUNCTIONS
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defun get-language-name ((lang pc-subtitle-lang))
"get the game-text-id from a lang"
(dolist (item *language-remap-info-pc*)
(when (= lang (the pc-subtitle-lang (/ (the int (cadr (car item))) 8)))
(return (the game-text-id (/ (the int (car (car item))) 8))))
)
(game-text-id zero)
)
(defun print-string-in-carousell ((arg0 game-text-id) (arg1 font-context) (arg2 int) (arg3 symbol))
(let ((s5-0 (if arg3
arg2
@@ -627,6 +669,12 @@
;; our options!
(set! (-> *game-options-pc* 0 value-to-modify) (&-> *setting-control* default vibration))
(set! (-> *game-options-pc* 1 value-to-modify) (&-> *setting-control* default play-hints))
(set! (-> *game-options-pc* 2 value-to-modify) (&-> *pc-settings* subtitles?))
(set! (-> *game-options-pc* 3 value-to-modify) (&-> *pc-settings* hinttitles?))
(set! (-> *game-options-pc* 4 value-to-modify) (&-> *setting-control* default language))
(set! (-> *game-options-pc* 5 value-to-modify) (&-> *progress-carousell* int-backup))
(set! (-> *game-options-pc* 6 value-to-modify) (&-> *progress-carousell* int-backup))
(set! (-> *game-options-pc* 7 value-to-modify) (&-> *progress-carousell* int-backup))
(set! (-> *graphic-options-pc* 1 value-to-modify) (&-> *progress-carousell* int-backup))
(set! (-> *graphic-options-pc* 2 value-to-modify) (&-> *pc-settings* vsync?))
;(set! (-> *graphic-options-pc* 4 value-to-modify) (&-> *progress-carousell* int-backup))
@@ -635,6 +683,7 @@
(set! (-> *graphic-options-no-frame-rate-pc* 2 value-to-modify) (&-> *pc-settings* vsync?))
;(set! (-> *graphic-options-pc* 4 value-to-modify) (&-> *progress-carousell* int-backup))
(set! (-> *misc-options* 0 value-to-modify) (&-> *pc-settings* discord-rpc?))
(set! (-> *misc-options* 1 value-to-modify) (&-> *pc-settings* money-starburst?))
(set! (-> *camera-options* 0 value-to-modify) (&-> *pc-settings* first-camera-h-inverted?))
(set! (-> *camera-options* 1 value-to-modify) (&-> *pc-settings* first-camera-v-inverted?))
(set! (-> *camera-options* 2 value-to-modify) (&-> *pc-settings* third-camera-h-inverted?))
@@ -646,12 +695,7 @@
(set! (-> *sound-options-pc* 0 value-to-modify) (&-> *setting-control* default sfx-volume))
(set! (-> *sound-options-pc* 1 value-to-modify) (&-> *setting-control* default music-volume))
(set! (-> *sound-options-pc* 2 value-to-modify) (&-> *setting-control* default dialog-volume))
(set! (-> *sound-options-pc* 3 value-to-modify) (&-> *setting-control* default language))
(set! (-> *sound-options-pc* 4 value-to-modify) (&-> *pc-settings* subtitles?))
(set! (-> *sound-options-pc* 5 value-to-modify) (&-> *pc-settings* hinttitles?))
(set! (-> *sound-options-pc* 6 value-to-modify) (&-> *progress-carousell* subtitle-backup))
(set! (-> *sound-options-pc* 7 value-to-modify) (&-> *progress-carousell* int-backup))
;(set! (-> *sound-options-pc* 8 value-to-modify) (&-> *pc-settings* music-fadein?))
;(set! (-> *sound-options-pc* 3 value-to-modify) (&-> *pc-settings* music-fadein?))
(set! (-> *progress-carousell* aspect-native-choice) (-> *pc-settings* use-vis?))
;; scroll stuff!
@@ -781,6 +825,8 @@
(game-option-type lod-fg)
(game-option-type speaker)
(game-option-type frame-rate)
(game-option-type language-subtitles)
(game-option-type language-text)
)
;; a carousell like language
(if (> (-> (the-as (pointer int) (-> options (-> obj option-index) value-to-modify))) 0)
@@ -792,17 +838,6 @@
(set! (-> *progress-carousell* direction) #t)
(set! sound? #t)
)
(((game-option-type language-subtitles))
;; a carousell like language
(if (> (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (the-as pc-subtitle-lang 0))
(+! (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (the-as pc-subtitle-lang -1))
(set! (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (the-as pc-subtitle-lang (1- (length (-> *progress-carousell* current-carousell)))))
)
;; updated.
(set! (-> *progress-carousell* transition) #t)
(set! (-> *progress-carousell* direction) #t)
(set! sound? #t)
)
)
(if sound?
(sound-play "cursor-l-r")
@@ -893,6 +928,8 @@
(game-option-type lod-fg)
(game-option-type speaker)
(game-option-type frame-rate)
(game-option-type language-subtitles)
(game-option-type language-text)
)
;; same thing as before. if at last, go to first. otherwise, keep going forward.
(if (< (-> (the-as (pointer int) (-> options (-> obj option-index) value-to-modify))) (1- (length (-> *progress-carousell* current-carousell))))
@@ -903,16 +940,6 @@
(set! (-> *progress-carousell* direction) #f)
(set! sound? #t)
)
(((game-option-type language-subtitles))
;; same thing as before. if at last, go to first. otherwise, keep going forward.
(if (< (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (1- (length (-> *progress-carousell* current-carousell))))
(+! (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (the-as pc-subtitle-lang 1))
(set! (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (the-as pc-subtitle-lang 0))
)
(set! (-> *progress-carousell* transition) #t)
(set! (-> *progress-carousell* direction) #f)
(set! sound? #t)
)
)
;; play sound if desired
(if sound?
@@ -1132,9 +1159,6 @@
(set! (-> *progress-state* language-backup)
(-> (the-as (pointer language-enum) (-> options (-> obj option-index) value-to-modify))))
)
(((game-option-type language-subtitles))
(set! (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))) (-> *pc-settings* subtitle-language))
)
(((game-option-type on-off) (game-option-type normal-inverted))
(set! (-> *progress-state* on-off-backup)
(-> (the-as (pointer symbol) (-> options (-> obj option-index) value-to-modify))))
@@ -1183,6 +1207,20 @@
(('150fps) (set! (-> *progress-carousell* int-backup) 2))
)
)
(((game-option-type language-subtitles))
(let ((cur-lang (get-language-name (-> *pc-settings* subtitle-language))))
(dotimes (i (-> *subtitle-languages* length))
(if (= (-> *subtitle-languages* i) cur-lang)
(set! (-> *progress-carousell* int-backup) i))
))
)
(((game-option-type language-text))
(let ((cur-lang (get-language-name (-> *pc-settings* text-language))))
(dotimes (i (-> *text-languages* length))
(if (= (-> *text-languages* i) cur-lang)
(set! (-> *progress-carousell* int-backup) i))
))
)
)
(sound-play "select-option")
(cpad-clear! 0 x)
@@ -1207,10 +1245,8 @@
(((game-option-type lod-fg)) (set! (-> *progress-carousell* current-carousell) *carousell-lod-bg*))
(((game-option-type speaker)) (set! (-> *progress-carousell* current-carousell) *carousell-speaker*))
(((game-option-type frame-rate)) (set! (-> *progress-carousell* current-carousell) *carousell-frame-rate*))
(((game-option-type language-subtitles))
(set! (-> *progress-carousell* current-carousell) *carousell-subtitle-language*)
(set! (-> *progress-carousell* selection) (the int (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify)))))
)
(((game-option-type language-subtitles)) (set! (-> *progress-carousell* current-carousell) *subtitle-languages*))
(((game-option-type language-text)) (set! (-> *progress-carousell* current-carousell) *text-languages*))
)
)
)
@@ -1262,12 +1298,17 @@
((1) (set! (-> *pc-settings* lod-force-actor) 0) (set! (-> *pc-settings* ps2-lod-dist?) #t))
)
)
(((game-option-type language))
(if (not (-> obj language-transition))
(load-level-text-files (-> obj display-level-index)))
)
(((game-option-type language-subtitles))
(set! (-> *pc-settings* subtitle-language) (-> (the-as (pointer pc-subtitle-lang) (-> options (-> obj option-index) value-to-modify))))
(let ((lang (assoc (the binteger (-> *subtitle-languages* (-> *progress-carousell* int-backup))) *language-remap-info-pc*)))
(set! (-> *pc-settings* subtitle-language) (the pc-subtitle-lang (/ (the int (cadr lang)) 8)))
)
)
(((game-option-type language-text))
(let ((lang (assoc (the binteger (-> *text-languages* (-> *progress-carousell* int-backup))) *language-remap-info-pc*)))
(set! (-> *pc-settings* text-language) (the pc-subtitle-lang (/ (the int (cadr lang)) 8)))
)
(if (not (-> *progress-carousell* transition))
(load-level-text-files (-> obj display-level-index)))
)
(((game-option-type speaker))
;; same thing.
@@ -1658,14 +1699,12 @@
(game-option-type lod-fg)
(game-option-type speaker)
(game-option-type frame-rate)
(game-option-type language-subtitles)
(game-option-type language-text)
)
;; crunched down to one generic function.
(progress-draw-carousell-from-string-list (-> *progress-carousell* current-carousell) font y-off (-> (the-as (pointer int) (-> options index value-to-modify))))
)
(((game-option-type language-subtitles))
;; crunched down to one generic function.
(progress-draw-carousell-from-string-list (-> *progress-carousell* current-carousell) font y-off (the int (-> (the-as (pointer pc-subtitle-lang) (-> options index value-to-modify)))))
)
(((game-option-type language))
;; language carousell. who knew this could be so complicated.
(let ((old-lang (-> obj language-selection))
@@ -1771,10 +1810,12 @@
(lookup-text! *common-text* (-> *language-name-remap* (-> (the-as (pointer uint64) (-> options index value-to-modify)))) #f)))
)
(((game-option-type language-subtitles))
(let ((stupidity (the int (-> (the-as (pointer pc-subtitle-lang) (-> options index value-to-modify))))))
(set! option-str (string-format "~S: ~S" (lookup-text! *common-text* (-> options index name) #f)
(lookup-text! *common-text* (-> *carousell-subtitle-language* stupidity) #f)))
)
(lookup-text! *common-text* (get-language-name (-> *pc-settings* subtitle-language)) #f)))
)
(((game-option-type language-text))
(set! option-str (string-format "~S: ~S" (lookup-text! *common-text* (-> options index name) #f)
(lookup-text! *common-text* (get-language-name (-> *pc-settings* text-language)) #f)))
)
)
)
@@ -1955,7 +1996,7 @@
(set! (-> progress-normal post)
(lambda :behavior progress ()
(when (progress-scrolling?)
(seek! (-> *progress-scroll* transition) 1.0 (* 1.75 (1/ 512) (-> self transition-speed) (-> *display* time-adjust-ratio)))
(seek! (-> *progress-scroll* transition) 1.0 (* (/ 1.75 512) (-> self transition-speed) (-> *display* time-adjust-ratio)))
)
(when (!= (-> self display-state) (-> *progress-scroll* last-screen))
(progress-scroll-reset)
@@ -1983,9 +2024,8 @@
(((progress-screen graphic-settings)
(progress-screen settings-title)
(progress-screen title)
(progress-screen game-settings)
(progress-screen sound-settings)
(progress-screen settings)
(progress-screen misc-options)
(progress-screen accessibility-options)
(progress-screen game-ps2-options)
(progress-screen resolution)
@@ -1995,6 +2035,10 @@
(hide-progress-icons)
(draw-options self 115 25 0.82)
)
(((progress-screen misc-options))
(hide-progress-icons)
(draw-options self 115 25 0.79)
)
(((progress-screen music-player))
(hide-progress-icons)
(draw-options self 128 21 0.82)
@@ -2012,7 +2056,7 @@
(hide-progress-icons)
(draw-options self 115 25 0.72)
)
(((progress-screen sound-settings))
(((progress-screen game-settings))
(hide-progress-icons)
(draw-options self 115 25 0.76)
)
goal_src/jak1/pc/subtitle.gc
+2 -1
View File
@@ -709,7 +709,8 @@
(print-game-subtitle (lookup-text! *common-text* (-> self notice-id) #f) (-> self font) #f 128 22)
)
)
((and (< (time-passed) (seconds 2))
((and (= (-> self cur-channel) (pc-subtitle-channel movie))
(< (time-passed) (seconds 2))
(< (mod (time-passed) (seconds 1)) (seconds 0.8)))
(set! (-> self font origin y) (* (-> *SUBTITLE-bank* notice-height) 224))
(print-game-subtitle (lookup-text! *common-text* (-> self notice-id) #f) (-> self font) #f 128 22)
scripts/batch/test-types.bat
+1 -1
View File
@@ -1,4 +1,4 @@
@echo off
cd ..\..
out\build\Release\bin\goalc-test --gtest_filter="TypeConsistency.TypeConsistency"
out\build\Release\bin\goalc-test --gtest_filter="Jak1TypeConsistency.TypeConsistency"
pause