diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc index 9d5bb6fa9..75a08362a 100644 --- a/decompiler/config/jak3/all-types.gc +++ b/decompiler/config/jak3/all-types.gc @@ -9115,18 +9115,18 @@ (credits-03a1 #x03a1) (credits-03b5 #x03b5) (credits-03be #x03be) - (text-03bf #x03bf) - (text-03c0 #x03c0) - (text-03c1 #x03c1) - (text-03c2 #x03c2) - (text-03c3 #x03c3) - (text-03c4 #x03c4) - (text-03c5 #x03c5) - (text-03c6 #x03c6) - (text-03c7 #x03c7) + (scatter-gun #x03bf) + (blaster #x03c0) + (vulcan-fury #x03c1) + (peace-maker #x03c2) + (stadium #x03c3) + (class-1-reverse #x03c4) + (class-2-reverse #x03c5) + (class-3-reverse #x03c6) + (peace-maker-gun-course #x03c7) (progress-missions-todo-icon #x03c8) (progress-missions-complete-icon #x03c9) - (text-03d1 #x03d1) + (blaster-training-peace-maker-training #x03d1) (credits-03e4 #x03e4) (credits-03e5 #x03e5) (credits-03e7 #x03e7) @@ -9144,13 +9144,13 @@ (credits-0401 #x0401) (credits-0403 #x0403) (credits-0404 #x0404) - (text-0408 #x0408) - (text-0409 #x0409) - (text-040a #x040a) - (text-040b #x040b) - (text-040c #x040c) - (text-040d #x040d) - (text-040e #x040e) + (press-to-jump #x0408) + (roll-how-to #x0409) + (double-jump-how-to #x040a) + (press-or-to-attack #x040b) + (roll-jump-how-to #x040c) + (ground-pound-how-to #x040d) + (high-jump-how-to #x040e) (credits-040f #x040f) (progress-missions-mine-explore #x0443) (progress-missions-mine-blow #x0444) @@ -9560,12 +9560,12 @@ (progress-controls-lightjak-wings #x06ba) (empty-string #x06bb) (progress-demo-return-to-title #x06bc) - (text-06bd #x06bd) + (text-06bd #x06bd) ;; "::" ? (meet-old-friends #x06be) (talk-to-torn-hq #x06bf) (wascity-defend-return-to-spargus #x06c0) (progress-audio-language #x06c1) - (text-06c2 #x06c2) + (text-06c2 #x06c2) ;; empty-string-2 (progress-inventory-v-turtle #x06c3) (progress-inventory-v-snake #x06c4) (progress-inventory-v-scorpion #x06c5) @@ -9593,8 +9593,8 @@ (credits-06db #x06db) (credits-06dc #x06dc) (credits-06dd #x06dd) - (text-06de #x06de) - (text-06df #x06df) + (protect-civilians #x06de) + (activate-statue-by-punching-kicking-nose #x06df) (progress-inventory-gun-red-1 #x06e0) (progress-inventory-gun-red-2 #x06e1) (progress-inventory-gun-red-3 #x06e2) @@ -9611,14 +9611,14 @@ (progress-inventory-armor1 #x06ed) (progress-inventory-armor2 #x06ee) (progress-inventory-armor3 #x06ef) - (text-06f0 #x06f0) - (text-06f1 #x06f1) - (text-06f2 #x06f2) - (text-06f3 #x06f3) - (text-06f4 #x06f4) - (text-06f5 #x06f5) - (text-06f6 #x06f6) - (text-06f7 #x06f7) + (progress-inventory-tough-puppy #x06f0) + (progress-inventory-sand-shark #x06f1) + (progress-inventory-gila-stomper #x06f2) + (progress-inventory-dune-hopper #x06f3) + (progress-inventory-heat-seeker #x06f4) + (progress-inventory-slam-dozer #x06f5) + (progress-inventory-dust-demon #x06f6) + (progress-inventory-desert-screamer #x06f7) (progress-inventory-board #x06f8) (progress-inventory-artifact-invis #x06f9) (progress-inventory-dark-strike #x06fa) @@ -9626,9 +9626,9 @@ (progress-inventory-lightjak-freeze #x06fc) (progress-inventory-lightjak-shield #x06fd) (progress-inventory-lightjak-swoop #x06fe) - (text-06ff #x06ff) - (text-0700 #x0700) - (text-0701 #x0701) + (progress-inventory-first-war-amulet #x06ff) + (progress-inventory-second-war-amulet #x0700) + (progress-inventory-complete-war-amulet #x0701) (progress-inventory-pass-wascity #x0702) (progress-inventory-seal-of-mar #x0703) (progress-inventory-pass-factory #x0704) @@ -9640,9 +9640,9 @@ (progress-inventory-light-eco-crystal #x070a) (progress-inventory-dark-eco-crystal #x070b) (progress-inventory-eco-sphere #x070c) - (text-070d #x070d) - (text-070e #x070e) - (text-070f #x070f) + (progress-inventory-scatter-gun #x070d) + (progress-inventory-wave-concussor #x070e) + (progress-inventory-plasmite-rpg #x070f) (credits-0710 #x0710) (credits-0711 #x0711) (credits-0712 #x0712) @@ -9740,13 +9740,13 @@ (credits-0772 #x0772) (credits-0773 #x0773) (credits-0774 #x0774) - (text-0775 #x0775) - (text-0776 #x0776) + (map-data-unavailable #x0775) + (light-jak-shield-how-to #x0776) (scene-catacomb-get-shield #x0778) - (text-0779 #x0779) + (press-to-use #x0779) (mission-fail-marauders-escaped #x077a) - (text-077b #x077b) - (text-077c #x077c) + (press-to-grab-objects #x077b) + (press-to-throw-held-objects #x077c) (credits-077d #x077d) (credits-077e #x077e) (credits-077f #x077f) @@ -9792,22 +9792,22 @@ (credits-07b1 #x07b1) (credits-07b2 #x07b2) (progress-secrets-unlimited-turbos #x07b3) - (text-07b4 #x07b4) - (text-07b5 #x07b5) + (dark-strike-how-to #x07b4) + (vehicle-destroyed #x07b5) (credits-07b6 #x07b6) (progress-language-portuguese #x07b8) - (text-07b9 #x07b9) - (text-07ba #x07ba) - (text-07bb #x07bb) - (text-07bc #x07bc) - (text-07bd #x07bd) - (text-07be #x07be) - (text-07bf #x07bf) - (text-07c0 #x07c0) - (text-07c1 #x07c1) - (text-07c2 #x07c2) - (text-07c3 #x07c3) - (text-07c4 #x07c4) + (hold-to-increase-speed #x07b9) + (you-can-now-afford-to-purchase-new-secrets #x07ba) + (museum-jak-one #x07bb) + (museum-jak #x07bc) + (museum-jakc #x07bd) + (museum-daxter #x07be) + (museum-pecker #x07bf) + (museum-torn #x07c0) + (museum-ashelin #x07c1) + (museum-tess #x07c2) + (use-the-wave-concussor #x07c3) + (hold-to-charge-and-then-release-to-fire-bigger-blast #x07c4) (credits-07c5 #x07c5) (credits-07c6 #x07c6) (progress-language-commentary #x07c7) @@ -9815,36 +9815,36 @@ (credits-07c9 #x07c9) (credits-07ca #x07ca) (progress-inventory #x07cb) - (text-07cc #x07cc) - (text-07cd #x07cd) - (text-07ce #x07ce) - (text-07cf #x07cf) + (out-of-time #x07cc) + (total-rolls #x07cd) + (total-distance #x07ce) + (best-distance #x07cf) (progress-footer-next-r1 #x07d0) (progress-footer-prev-l1 #x07d1) (progress-title-commentary #x07d2) - (text-07d3 #x07d3) - (text-07d4 #x07d4) + (progress-title-animator-commentary #x07d3) + (progress-title-creative-director-commentary #x07d4) (progress-secrets-fast-movie #x07d5) (progress-secrets-slow-movie #x07d6) - (text-07d7 #x07d7) - (text-07d8 #x07d8) + (progress-secrets-game-statistics #x07d7) + (progress-secrets-kleivers-diaper #x07d8) (progress-secrets-red-ammo-capacity #x07d9) (progress-secrets-yellow-ammo-capacity #x07da) (progress-secrets-blue-ammo-capacity #x07db) (progress-secrets-dark-ammo-capacity #x07dc) - (text-07dd #x07dd) + (progress-secrets-gravity-well-mod #x07dd) (progress-secrets-gungame-ratchet #x07de) (progress-secrets-endless-light #x07df) (progress-secrets-bad-weather #x07e0) - (text-07e1 #x07e1) - (text-07e2 #x07e2) + (progress-secrets-fast-time-of-day #x07e1) + (progress-secrets-play-as-jak-ii #x07e2) (progress-title-jak3-mdl-viewer #x07e3) (progress-title-jak2-mdl-viewer #x07e4) (progress-title-jak1-mdl-viewer #x07e5) - (text-07e6 #x07e6) - (text-07e7 #x07e7) - (text-07e8 #x07e8) - (text-07e9 #x07e9) + (press-to-play-wave-concussor-training #x07e6) + (press-to-play-beam-reflexor-training #x07e7) + (wave-concussor-training-ratchet-gun-course #x07e8) + (beam-reflexor-training-clank-gun-course #x07e9) (progress-secrets-kleever-diaper #x07ea) (credits-07eb #x07eb) (credits-07ec #x07ec) @@ -9857,24 +9857,24 @@ (credits-07f3 #x07f3) (credits-07f4 #x07f4) (credits-07f5 #x07f5) - (text-07f6 #x07f6) - (text-07f7 #x07f7) - (text-07f8 #x07f8) - (text-07f9 #x07f9) - (text-07fa #x07fa) - (text-07fb #x07fb) - (text-07fc #x07fc) - (text-07fd #x07fd) - (text-07fe #x07fe) - (text-07ff #x07ff) - (text-0800 #x0800) - (text-0801 #x0801) - (text-0802 #x0802) - (text-0803 #x0803) - (text-0804 #x0804) - (text-0805 #x0805) - (text-0806 #x0806) - (text-0807 #x0807) + (kills #x07f6) + (museum-kleever #x07f7) + (museum-samos #x07f8) + (museum-seem #x07f9) + (museum-keira #x07fa) + (museum-ottsel-dummy #x07fb) + (museum-ottsel-tess #x07fc) + (museum-sig #x07fd) + (museum-ottsel-leader #x07fe) + (museum-ottsel-surfer #x07ff) + (museum-ottsel-veger #x0800) + (museum-onin #x0801) + (museum-damus #x0802) + (museum-jinx #x0803) + (museum-cyber-errol #x0804) + (museum-veger #x0805) + (credits-starring #x0806) + (press-to-place-held-objects #x0807) (progress-controls-pad-cross-square-cross #x0808) (progress-controls-pad-l1-square #x0809) (progress-controls-super-flop #x080a) @@ -9889,43 +9889,43 @@ (credits-0813 #x0813) (credits-0814 #x0814) (credits-0815 #x0815) - (text-0816 #x0816) - (text-0817 #x0817) - (text-0818 #x0818) - (text-0819 #x0819) - (text-081a #x081a) - (text-081b #x081b) - (text-081c #x081c) - (text-081d #x081d) - (text-081e #x081e) - (text-081f #x081f) - (text-0820 #x0820) - (text-0821 #x0821) - (text-0822 #x0822) - (text-0823 #x0823) - (text-0824 #x0824) - (text-0825 #x0825) - (text-0826 #x0826) - (text-0827 #x0827) - (text-0828 #x0828) - (text-0829 #x0829) - (text-082a #x082a) - (text-082b #x082b) - (text-082c #x082c) - (text-082d #x082d) - (text-082e #x082e) - (text-082f #x082f) - (text-0830 #x0830) - (text-0831 #x0831) - (text-0832 #x0832) - (text-0833 #x0833) + (museum-baron #x0816) + (museum-youngsamos #x0817) + (museum-brutter #x0818) + (museum-red-crimson-guard #x0819) + (museum-flutflut #x081a) + (museum-mayor #x081b) + (museum-redsage #x081c) + (museum-sculptor #x081d) + (museum-sidekick-human #x081e) + (museum-yellowsage #x081f) + (museum-warrior #x0820) + (museum-geologist #x0821) + (museum-gambler #x0822) + (museum-minershort #x0823) + (museum-minertall #x0824) + (museum-ogreboss #x0825) + (museum-bird-lady #x0826) + (museum-bluesage #x0827) + (museum-evilbro #x0828) + (museum-evilsis #x0829) + (museum-explorer #x082a) + (museum-farmer #x082b) + (museum-fisher #x082c) + (museum-crocadog #x082d) + (museum-kid #x082e) + (museum-kor #x082f) + (museum-errol #x0830) + (museum-babak #x0831) + (museum-billy #x0832) + (your-distance #x0833) (progress-secrets-weapon-upgrades #x0834) (progress-secrets-cheats #x0835) (progress-secrets-vehicle-upgrades #x0836) (progress-secrets-crazy-stuff #x0837) (progress-secrets-art-gallery #x0838) (progress-secrets-expert-options #x0839) - (text-083a #x083a) + (unavailable #x083a) (progress-secrets-gun-upgrade-red-1 #x083b) (progress-secrets-gun-upgrade-red-2 #x083c) (progress-secrets-gun-upgrade-red-3 #x083d) @@ -9954,20 +9954,20 @@ (credits-0854 #x0854) (credits-0855 #x0855) (progress-secrets-price #x0856) - (text-0857 #x0857) - (text-0858 #x0858) - (text-085a #x085a) + (new-secrets-available #x0857) + (secrets-still-available #x0858) + (dark-bomb-how-to #x085a) (credits-085b #x085b) (credits-085c #x085c) (credits-085d #x085d) (credits-085e #x085e) - (text-085f #x085f) - (text-0860 #x0860) - (text-0861 #x0861) - (text-0862 #x0862) - (text-0863 #x0863) - (text-0864 #x0864) - (text-0866 #x0866) + (bring-sand-shark #x085f) + (bring-sand-shark-heat-seeker-dust-demon-desert-screamer #x0860) + (extra-time #x0861) + (hold-to-auto-fire #x0862) + (used-precursor-artifacts #x0863) + (hold-to-use-shield #x0864) + (score #x0866) (progress-inventory-vehicles #x0867) (progress-inventory-armor #x0868) (progress-inventory-darkjak #x0869) @@ -9997,10 +9997,10 @@ (credits-0882 #x0882) (progress-controls-pad-l2-lanalog #x0883) (progress-controls-board-grab #x0884) - (text-0885 #x0885) - (text-0886 #x0886) - (text-0887 #x0887) - (text-0888 #x0888) + (hold-to-charge-and-then-release-to-fire-blast #x0885) + (press-again-to-make-gyro-burster-hover-in-place #x0886) + (locked #x0887) + (use-turbo-to-break-obstacles #x0888) (credits-0889 #x0889) (progress-controls-pad-360-spin #x088a) (progress-controls-pad-triangle-2 #x088b) @@ -10009,14 +10009,14 @@ (commentary-intro-palace #x088e) (commentary-intro-rescue #x088f) (commentary-intro-training #x0891) - (text-0892 #x0892) - (text-0893 #x0893) - (text-0894 #x0894) - (text-0895 #x0895) - (text-0896 #x0896) - (text-0897 #x0897) + (congrats-600-orbs-new-duds #x0892) + (museum-krew #x0893) + (museum-vin #x0894) + (you-finished #x0895) + (save-hero-mode-file #x0896) + (hero-mode-how-to #x0897) (talk-to-ashelin #x0898) - (text-0899 #x0899) + (press-to-accept #x0899) (credits-089c #x089c) (credits-089d #x089d) (credits-089e #x089e) diff --git a/goal_src/jak3/engine/ambient/ambient-h.gc b/goal_src/jak3/engine/ambient/ambient-h.gc index abc073f05..46c6b4c08 100644 --- a/goal_src/jak3/engine/ambient/ambient-h.gc +++ b/goal_src/jak3/engine/ambient/ambient-h.gc @@ -25,6 +25,11 @@ (define-extern talker-surpress! (function int)) (define-extern voicebox-spawn (function process-drawable vector (pointer process))) +(declare-type talker-speech-class structure) +(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id)) +(declare-type talker process) +(define-extern talker-init (function talker-speech-class vector region none :behavior talker)) + ;; DECOMP BEGINS (deftype talker-speech-class (structure) @@ -51,7 +56,6 @@ ) ) -(define-extern talker-spawn-func (function talker-speech-class process-tree vector region sound-id)) (deftype talker (process) ((trans vector :inline) @@ -78,7 +82,6 @@ ) ) -(define-extern talker-init (function talker-speech-class vector region none :behavior talker)) (define *talker-speech* (new 'static 'inline-array talker-speech-class 365 (new 'static 'talker-speech-class :name "none") @@ -89,7 +92,7 @@ :speech #x1 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -100,7 +103,7 @@ :speech #x2 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -111,7 +114,7 @@ :speech #x3 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040b) + :text-message (text-id press-or-to-attack) :on-close #f :camera #f ) @@ -122,7 +125,7 @@ :speech #x4 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040b) + :text-message (text-id press-or-to-attack) :on-close #f :camera #f ) @@ -142,7 +145,7 @@ :speech #x6 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -162,7 +165,7 @@ :speech #x8 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -173,7 +176,7 @@ :speech #x9 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -184,7 +187,7 @@ :speech #xa :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -195,7 +198,7 @@ :speech #xb :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -206,7 +209,7 @@ :speech #xc :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -235,7 +238,7 @@ :speech #xf :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -246,7 +249,7 @@ :speech #x10 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -257,7 +260,7 @@ :speech #x11 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -268,7 +271,7 @@ :speech #x12 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -288,7 +291,7 @@ :speech #x14 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -330,7 +333,7 @@ :speech #x18 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -742,7 +745,7 @@ :speech #x44 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -753,7 +756,7 @@ :speech #x45 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -764,7 +767,7 @@ :speech #x46 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -786,7 +789,7 @@ :speech #x48 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -808,7 +811,7 @@ :speech #x4a :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -819,7 +822,7 @@ :speech #x4b :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -830,7 +833,7 @@ :speech #x4c :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -841,7 +844,7 @@ :speech #x4d :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -852,7 +855,7 @@ :speech #x4e :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -863,7 +866,7 @@ :speech #x4f :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -993,7 +996,7 @@ :speech #x5c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0888) + :text-message (text-id use-turbo-to-break-obstacles) :on-close #f :camera #f ) @@ -1119,7 +1122,7 @@ :speech #x69 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-06df) + :text-message (text-id activate-statue-by-punching-kicking-nose) :on-close #f :camera #f ) @@ -1474,7 +1477,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-07ba) + :text-message (text-id you-can-now-afford-to-purchase-new-secrets) :on-close #f :camera #f ) @@ -1486,7 +1489,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0857) + :text-message (text-id new-secrets-available) :on-close #f :camera #f ) @@ -1498,7 +1501,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0858) + :text-message (text-id secrets-still-available) :on-close #f :camera #f ) @@ -1510,7 +1513,7 @@ :text-duration (seconds 10) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0892) + :text-message (text-id congrats-600-orbs-new-duds) :on-close #f :camera #f ) @@ -1678,7 +1681,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -1689,7 +1692,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -1700,7 +1703,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -1711,7 +1714,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -3232,7 +3235,7 @@ :speech #x15c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-077b) + :text-message (text-id press-to-grab-objects) :on-close #f :camera #f ) @@ -3243,7 +3246,7 @@ :speech #x15d :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0807) + :text-message (text-id press-to-place-held-objects) :on-close #f :camera #f ) @@ -3254,7 +3257,7 @@ :speech #x15e :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0864) + :text-message (text-id hold-to-use-shield) :on-close #f :camera #f ) @@ -3284,7 +3287,7 @@ :speech #x161 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07b4) + :text-message (text-id dark-strike-how-to) :on-close #f :camera #f ) @@ -3295,7 +3298,7 @@ :speech #x162 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07c3) + :text-message (text-id use-the-wave-concussor) :on-close #f :camera #f ) @@ -3306,7 +3309,7 @@ :speech #x163 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07c4) + :text-message (text-id hold-to-charge-and-then-release-to-fire-bigger-blast) :on-close #f :camera #f ) @@ -3371,7 +3374,7 @@ :speech #x16a :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0862) + :text-message (text-id hold-to-auto-fire) :on-close #f :camera #f ) @@ -3391,7 +3394,7 @@ :speech #x16c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0886) + :text-message (text-id press-again-to-make-gyro-burster-hover-in-place) :on-close #f :camera #f ) diff --git a/goal_src/jak3/engine/ui/text-h.gc b/goal_src/jak3/engine/ui/text-h.gc index dffbffafb..8e801887f 100644 --- a/goal_src/jak3/engine/ui/text-h.gc +++ b/goal_src/jak3/engine/ui/text-h.gc @@ -415,18 +415,18 @@ (credits-03a1 #x03a1) (credits-03b5 #x03b5) (credits-03be #x03be) - (text-03bf #x03bf) - (text-03c0 #x03c0) - (text-03c1 #x03c1) - (text-03c2 #x03c2) - (text-03c3 #x03c3) - (text-03c4 #x03c4) - (text-03c5 #x03c5) - (text-03c6 #x03c6) - (text-03c7 #x03c7) + (scatter-gun #x03bf) + (blaster #x03c0) + (vulcan-fury #x03c1) + (peace-maker #x03c2) + (stadium #x03c3) + (class-1-reverse #x03c4) + (class-2-reverse #x03c5) + (class-3-reverse #x03c6) + (peace-maker-gun-course #x03c7) (progress-missions-todo-icon #x03c8) (progress-missions-complete-icon #x03c9) - (text-03d1 #x03d1) + (blaster-training-peace-maker-training #x03d1) (credits-03e4 #x03e4) (credits-03e5 #x03e5) (credits-03e7 #x03e7) @@ -444,13 +444,13 @@ (credits-0401 #x0401) (credits-0403 #x0403) (credits-0404 #x0404) - (text-0408 #x0408) - (text-0409 #x0409) - (text-040a #x040a) - (text-040b #x040b) - (text-040c #x040c) - (text-040d #x040d) - (text-040e #x040e) + (press-to-jump #x0408) + (roll-how-to #x0409) + (double-jump-how-to #x040a) + (press-or-to-attack #x040b) + (roll-jump-how-to #x040c) + (ground-pound-how-to #x040d) + (high-jump-how-to #x040e) (credits-040f #x040f) (progress-missions-mine-explore #x0443) (progress-missions-mine-blow #x0444) @@ -860,12 +860,12 @@ (progress-controls-lightjak-wings #x06ba) (empty-string #x06bb) (progress-demo-return-to-title #x06bc) - (text-06bd #x06bd) + (text-06bd #x06bd) ;; "::" ? (meet-old-friends #x06be) (talk-to-torn-hq #x06bf) (wascity-defend-return-to-spargus #x06c0) (progress-audio-language #x06c1) - (text-06c2 #x06c2) + (text-06c2 #x06c2) ;; empty-string-2 (progress-inventory-v-turtle #x06c3) (progress-inventory-v-snake #x06c4) (progress-inventory-v-scorpion #x06c5) @@ -893,8 +893,8 @@ (credits-06db #x06db) (credits-06dc #x06dc) (credits-06dd #x06dd) - (text-06de #x06de) - (text-06df #x06df) + (protect-civilians #x06de) + (activate-statue-by-punching-kicking-nose #x06df) (progress-inventory-gun-red-1 #x06e0) (progress-inventory-gun-red-2 #x06e1) (progress-inventory-gun-red-3 #x06e2) @@ -911,14 +911,14 @@ (progress-inventory-armor1 #x06ed) (progress-inventory-armor2 #x06ee) (progress-inventory-armor3 #x06ef) - (text-06f0 #x06f0) - (text-06f1 #x06f1) - (text-06f2 #x06f2) - (text-06f3 #x06f3) - (text-06f4 #x06f4) - (text-06f5 #x06f5) - (text-06f6 #x06f6) - (text-06f7 #x06f7) + (progress-inventory-tough-puppy #x06f0) + (progress-inventory-sand-shark #x06f1) + (progress-inventory-gila-stomper #x06f2) + (progress-inventory-dune-hopper #x06f3) + (progress-inventory-heat-seeker #x06f4) + (progress-inventory-slam-dozer #x06f5) + (progress-inventory-dust-demon #x06f6) + (progress-inventory-desert-screamer #x06f7) (progress-inventory-board #x06f8) (progress-inventory-artifact-invis #x06f9) (progress-inventory-dark-strike #x06fa) @@ -926,9 +926,9 @@ (progress-inventory-lightjak-freeze #x06fc) (progress-inventory-lightjak-shield #x06fd) (progress-inventory-lightjak-swoop #x06fe) - (text-06ff #x06ff) - (text-0700 #x0700) - (text-0701 #x0701) + (progress-inventory-first-war-amulet #x06ff) + (progress-inventory-second-war-amulet #x0700) + (progress-inventory-complete-war-amulet #x0701) (progress-inventory-pass-wascity #x0702) (progress-inventory-seal-of-mar #x0703) (progress-inventory-pass-factory #x0704) @@ -940,9 +940,9 @@ (progress-inventory-light-eco-crystal #x070a) (progress-inventory-dark-eco-crystal #x070b) (progress-inventory-eco-sphere #x070c) - (text-070d #x070d) - (text-070e #x070e) - (text-070f #x070f) + (progress-inventory-scatter-gun #x070d) + (progress-inventory-wave-concussor #x070e) + (progress-inventory-plasmite-rpg #x070f) (credits-0710 #x0710) (credits-0711 #x0711) (credits-0712 #x0712) @@ -1040,13 +1040,13 @@ (credits-0772 #x0772) (credits-0773 #x0773) (credits-0774 #x0774) - (text-0775 #x0775) - (text-0776 #x0776) + (map-data-unavailable #x0775) + (light-jak-shield-how-to #x0776) (scene-catacomb-get-shield #x0778) - (text-0779 #x0779) + (press-to-use #x0779) (mission-fail-marauders-escaped #x077a) - (text-077b #x077b) - (text-077c #x077c) + (press-to-grab-objects #x077b) + (press-to-throw-held-objects #x077c) (credits-077d #x077d) (credits-077e #x077e) (credits-077f #x077f) @@ -1092,22 +1092,22 @@ (credits-07b1 #x07b1) (credits-07b2 #x07b2) (progress-secrets-unlimited-turbos #x07b3) - (text-07b4 #x07b4) - (text-07b5 #x07b5) + (dark-strike-how-to #x07b4) + (vehicle-destroyed #x07b5) (credits-07b6 #x07b6) (progress-language-portuguese #x07b8) - (text-07b9 #x07b9) - (text-07ba #x07ba) - (text-07bb #x07bb) - (text-07bc #x07bc) - (text-07bd #x07bd) - (text-07be #x07be) - (text-07bf #x07bf) - (text-07c0 #x07c0) - (text-07c1 #x07c1) - (text-07c2 #x07c2) - (text-07c3 #x07c3) - (text-07c4 #x07c4) + (hold-to-increase-speed #x07b9) + (you-can-now-afford-to-purchase-new-secrets #x07ba) + (museum-jak-one #x07bb) + (museum-jak #x07bc) + (museum-jakc #x07bd) + (museum-daxter #x07be) + (museum-pecker #x07bf) + (museum-torn #x07c0) + (museum-ashelin #x07c1) + (museum-tess #x07c2) + (use-the-wave-concussor #x07c3) + (hold-to-charge-and-then-release-to-fire-bigger-blast #x07c4) (credits-07c5 #x07c5) (credits-07c6 #x07c6) (progress-language-commentary #x07c7) @@ -1115,36 +1115,36 @@ (credits-07c9 #x07c9) (credits-07ca #x07ca) (progress-inventory #x07cb) - (text-07cc #x07cc) - (text-07cd #x07cd) - (text-07ce #x07ce) - (text-07cf #x07cf) + (out-of-time #x07cc) + (total-rolls #x07cd) + (total-distance #x07ce) + (best-distance #x07cf) (progress-footer-next-r1 #x07d0) (progress-footer-prev-l1 #x07d1) (progress-title-commentary #x07d2) - (text-07d3 #x07d3) - (text-07d4 #x07d4) + (progress-title-animator-commentary #x07d3) + (progress-title-creative-director-commentary #x07d4) (progress-secrets-fast-movie #x07d5) (progress-secrets-slow-movie #x07d6) - (text-07d7 #x07d7) - (text-07d8 #x07d8) + (progress-secrets-game-statistics #x07d7) + (progress-secrets-kleivers-diaper #x07d8) (progress-secrets-red-ammo-capacity #x07d9) (progress-secrets-yellow-ammo-capacity #x07da) (progress-secrets-blue-ammo-capacity #x07db) (progress-secrets-dark-ammo-capacity #x07dc) - (text-07dd #x07dd) + (progress-secrets-gravity-well-mod #x07dd) (progress-secrets-gungame-ratchet #x07de) (progress-secrets-endless-light #x07df) (progress-secrets-bad-weather #x07e0) - (text-07e1 #x07e1) - (text-07e2 #x07e2) + (progress-secrets-fast-time-of-day #x07e1) + (progress-secrets-play-as-jak-ii #x07e2) (progress-title-jak3-mdl-viewer #x07e3) (progress-title-jak2-mdl-viewer #x07e4) (progress-title-jak1-mdl-viewer #x07e5) - (text-07e6 #x07e6) - (text-07e7 #x07e7) - (text-07e8 #x07e8) - (text-07e9 #x07e9) + (press-to-play-wave-concussor-training #x07e6) + (press-to-play-beam-reflexor-training #x07e7) + (wave-concussor-training-ratchet-gun-course #x07e8) + (beam-reflexor-training-clank-gun-course #x07e9) (progress-secrets-kleever-diaper #x07ea) (credits-07eb #x07eb) (credits-07ec #x07ec) @@ -1157,24 +1157,24 @@ (credits-07f3 #x07f3) (credits-07f4 #x07f4) (credits-07f5 #x07f5) - (text-07f6 #x07f6) - (text-07f7 #x07f7) - (text-07f8 #x07f8) - (text-07f9 #x07f9) - (text-07fa #x07fa) - (text-07fb #x07fb) - (text-07fc #x07fc) - (text-07fd #x07fd) - (text-07fe #x07fe) - (text-07ff #x07ff) - (text-0800 #x0800) - (text-0801 #x0801) - (text-0802 #x0802) - (text-0803 #x0803) - (text-0804 #x0804) - (text-0805 #x0805) - (text-0806 #x0806) - (text-0807 #x0807) + (kills #x07f6) + (museum-kleever #x07f7) + (museum-samos #x07f8) + (museum-seem #x07f9) + (museum-keira #x07fa) + (museum-ottsel-dummy #x07fb) + (museum-ottsel-tess #x07fc) + (museum-sig #x07fd) + (museum-ottsel-leader #x07fe) + (museum-ottsel-surfer #x07ff) + (museum-ottsel-veger #x0800) + (museum-onin #x0801) + (museum-damus #x0802) + (museum-jinx #x0803) + (museum-cyber-errol #x0804) + (museum-veger #x0805) + (credits-starring #x0806) + (press-to-place-held-objects #x0807) (progress-controls-pad-cross-square-cross #x0808) (progress-controls-pad-l1-square #x0809) (progress-controls-super-flop #x080a) @@ -1189,43 +1189,43 @@ (credits-0813 #x0813) (credits-0814 #x0814) (credits-0815 #x0815) - (text-0816 #x0816) - (text-0817 #x0817) - (text-0818 #x0818) - (text-0819 #x0819) - (text-081a #x081a) - (text-081b #x081b) - (text-081c #x081c) - (text-081d #x081d) - (text-081e #x081e) - (text-081f #x081f) - (text-0820 #x0820) - (text-0821 #x0821) - (text-0822 #x0822) - (text-0823 #x0823) - (text-0824 #x0824) - (text-0825 #x0825) - (text-0826 #x0826) - (text-0827 #x0827) - (text-0828 #x0828) - (text-0829 #x0829) - (text-082a #x082a) - (text-082b #x082b) - (text-082c #x082c) - (text-082d #x082d) - (text-082e #x082e) - (text-082f #x082f) - (text-0830 #x0830) - (text-0831 #x0831) - (text-0832 #x0832) - (text-0833 #x0833) + (museum-baron #x0816) + (museum-youngsamos #x0817) + (museum-brutter #x0818) + (museum-red-crimson-guard #x0819) + (museum-flutflut #x081a) + (museum-mayor #x081b) + (museum-redsage #x081c) + (museum-sculptor #x081d) + (museum-sidekick-human #x081e) + (museum-yellowsage #x081f) + (museum-warrior #x0820) + (museum-geologist #x0821) + (museum-gambler #x0822) + (museum-minershort #x0823) + (museum-minertall #x0824) + (museum-ogreboss #x0825) + (museum-bird-lady #x0826) + (museum-bluesage #x0827) + (museum-evilbro #x0828) + (museum-evilsis #x0829) + (museum-explorer #x082a) + (museum-farmer #x082b) + (museum-fisher #x082c) + (museum-crocadog #x082d) + (museum-kid #x082e) + (museum-kor #x082f) + (museum-errol #x0830) + (museum-babak #x0831) + (museum-billy #x0832) + (your-distance #x0833) (progress-secrets-weapon-upgrades #x0834) (progress-secrets-cheats #x0835) (progress-secrets-vehicle-upgrades #x0836) (progress-secrets-crazy-stuff #x0837) (progress-secrets-art-gallery #x0838) (progress-secrets-expert-options #x0839) - (text-083a #x083a) + (unavailable #x083a) (progress-secrets-gun-upgrade-red-1 #x083b) (progress-secrets-gun-upgrade-red-2 #x083c) (progress-secrets-gun-upgrade-red-3 #x083d) @@ -1254,20 +1254,20 @@ (credits-0854 #x0854) (credits-0855 #x0855) (progress-secrets-price #x0856) - (text-0857 #x0857) - (text-0858 #x0858) - (text-085a #x085a) + (new-secrets-available #x0857) + (secrets-still-available #x0858) + (dark-bomb-how-to #x085a) (credits-085b #x085b) (credits-085c #x085c) (credits-085d #x085d) (credits-085e #x085e) - (text-085f #x085f) - (text-0860 #x0860) - (text-0861 #x0861) - (text-0862 #x0862) - (text-0863 #x0863) - (text-0864 #x0864) - (text-0866 #x0866) + (bring-sand-shark #x085f) + (bring-sand-shark-heat-seeker-dust-demon-desert-screamer #x0860) + (extra-time #x0861) + (hold-to-auto-fire #x0862) + (used-precursor-artifacts #x0863) + (hold-to-use-shield #x0864) + (score #x0866) (progress-inventory-vehicles #x0867) (progress-inventory-armor #x0868) (progress-inventory-darkjak #x0869) @@ -1297,10 +1297,10 @@ (credits-0882 #x0882) (progress-controls-pad-l2-lanalog #x0883) (progress-controls-board-grab #x0884) - (text-0885 #x0885) - (text-0886 #x0886) - (text-0887 #x0887) - (text-0888 #x0888) + (hold-to-charge-and-then-release-to-fire-blast #x0885) + (press-again-to-make-gyro-burster-hover-in-place #x0886) + (locked #x0887) + (use-turbo-to-break-obstacles #x0888) (credits-0889 #x0889) (progress-controls-pad-360-spin #x088a) (progress-controls-pad-triangle-2 #x088b) @@ -1309,14 +1309,14 @@ (commentary-intro-palace #x088e) (commentary-intro-rescue #x088f) (commentary-intro-training #x0891) - (text-0892 #x0892) - (text-0893 #x0893) - (text-0894 #x0894) - (text-0895 #x0895) - (text-0896 #x0896) - (text-0897 #x0897) + (congrats-600-orbs-new-duds #x0892) + (museum-krew #x0893) + (museum-vin #x0894) + (you-finished #x0895) + (save-hero-mode-file #x0896) + (hero-mode-how-to #x0897) (talk-to-ashelin #x0898) - (text-0899 #x0899) + (press-to-accept #x0899) (credits-089c #x089c) (credits-089d #x089d) (credits-089e #x089e) diff --git a/goal_src/jak3/levels/city/ctywide-obs.gc b/goal_src/jak3/levels/city/ctywide-obs.gc index d6fdfcb64..ab331cec3 100644 --- a/goal_src/jak3/levels/city/ctywide-obs.gc +++ b/goal_src/jak3/levels/city/ctywide-obs.gc @@ -3016,7 +3016,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "~S") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0866) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id score) #f)) (s5-0 gp-1 s4-0 *temp-string*) ) 0 diff --git a/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc b/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc index e75eda494..74bf4903c 100644 --- a/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc +++ b/goal_src/jak3/levels/city/port/attack/ctyport-attack.gc @@ -407,7 +407,7 @@ :speech #x30 :text-duration (seconds 3) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) diff --git a/goal_src/jak3/levels/city/protect/assault-shared.gc b/goal_src/jak3/levels/city/protect/assault-shared.gc index d540860af..dac2fa8f4 100644 --- a/goal_src/jak3/levels/city/protect/assault-shared.gc +++ b/goal_src/jak3/levels/city/protect/assault-shared.gc @@ -143,7 +143,7 @@ :speech #xd :text-duration (seconds 4) :neg #x1 - :text-message (text-id text-06de) + :text-message (text-id protect-civilians) :on-close #f :camera #f ) diff --git a/goal_src/jak3/levels/city/vinroom/power-game.gc b/goal_src/jak3/levels/city/vinroom/power-game.gc index 367a29566..24d1fd38c 100644 --- a/goal_src/jak3/levels/city/vinroom/power-game.gc +++ b/goal_src/jak3/levels/city/vinroom/power-game.gc @@ -798,7 +798,7 @@ :speech #x1 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07b9) + :text-message (text-id hold-to-increase-speed) :on-close #f :camera #f ) diff --git a/goal_src/jak3/levels/comb/comb-obs.gc b/goal_src/jak3/levels/comb/comb-obs.gc index 440caf056..2679bdcf0 100644 --- a/goal_src/jak3/levels/comb/comb-obs.gc +++ b/goal_src/jak3/levels/comb/comb-obs.gc @@ -1147,7 +1147,7 @@ ) (let ((gp-0 (current-time))) (until (time-elapsed? gp-0 (seconds 6)) - (print-text self (text-id text-0776)) + (print-text self (text-id light-jak-shield-how-to)) (suspend) ) ) diff --git a/goal_src/jak3/levels/desert/des-bbush-tasks.gc b/goal_src/jak3/levels/desert/des-bbush-tasks.gc index 65b2cde6b..73cc7aba8 100644 --- a/goal_src/jak3/levels/desert/des-bbush-tasks.gc +++ b/goal_src/jak3/levels/desert/des-bbush-tasks.gc @@ -522,7 +522,7 @@ :fail (new 'static 'resetter-spec :continue #f :reset-mode 'life :execute #f) :retry (new 'static 'resetter-spec :continue "desert-bbush-desc-4" :reset-mode 'try :execute #f) :reset-delay (seconds 6.5) - :text-message (text-id text-07cc) + :text-message (text-id out-of-time) ) ) @@ -566,7 +566,7 @@ (let ((gp-3 (on-fail self 'fail))) (when gp-3 (mem-copy! (the-as pointer *bbv-fail-time-expired*) (the-as pointer gp-3) 48) - (set! (-> gp-3 text-message) (text-id text-07cc)) + (set! (-> gp-3 text-message) (text-id out-of-time)) ) ) (go-virtual fail *bbv-fail-time-expired*) @@ -634,7 +634,7 @@ (set! (-> this display-units) 0.00024414062) (set! (-> this time-limit) (seconds 30)) (set! (-> this game-score) (the-as uint 6)) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-0833)) + (set! (-> *wasbbv-hud-info* score-text) (text-id your-distance)) (set! (-> *wasbbv-hud-info* decimal-place-count) 1) (none) ) @@ -659,7 +659,7 @@ (set! (-> this display-units) 0.00024414062) (set! (-> this time-limit) (seconds 60)) (set! (-> this game-score) (the-as uint 7)) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07ce)) + (set! (-> *wasbbv-hud-info* score-text) (text-id total-distance)) (set! (-> *wasbbv-hud-info* decimal-place-count) 1) (none) ) @@ -687,7 +687,7 @@ (set! (-> this time-limit) (seconds 60)) (set! (-> this game-score) (the-as uint 8)) (set! (-> this want-current-hud?) #f) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07cd)) + (set! (-> *wasbbv-hud-info* score-text) (text-id total-rolls)) (set! (-> *wasbbv-hud-info* decimal-place-count) 0) 0 (none) @@ -727,7 +727,7 @@ (set! (-> this game-score) (the-as uint 16)) (set! (-> this want-current-hud?) #f) (set! (-> this max-reserve-count) 1000) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07f6)) + (set! (-> *wasbbv-hud-info* score-text) (text-id kills)) (set! (-> *wasbbv-hud-info* decimal-place-count) 0) (set! (-> *was-squad-control* target-count) 0) 0 diff --git a/goal_src/jak3/levels/desert/des-burning-bush.gc b/goal_src/jak3/levels/desert/des-burning-bush.gc index b11a8ed0e..5073f2521 100644 --- a/goal_src/jak3/levels/desert/des-burning-bush.gc +++ b/goal_src/jak3/levels/desert/des-burning-bush.gc @@ -130,7 +130,7 @@ (define *bbush-menu* (new 'static 'bbush-menu :title-text (text-id text-0624) - :req-text (text-id text-0860) + :req-text (text-id bring-sand-shark-heat-seeker-dust-demon-desert-screamer) :req-check (lambda () (case (-> *game-info* current-vehicle) (((vehicle-type-u8 v-snake) (vehicle-type-u8 v-fox) (vehicle-type-u8 v-mirage) (vehicle-type-u8 v-x-ride)) @@ -308,7 +308,7 @@ ) ) (print-game-text - (lookup-text! *common-text* (text-id text-085f) #f) + (lookup-text! *common-text* (text-id bring-sand-shark) #f) s5-1 #f 44 diff --git a/goal_src/jak3/levels/desert/des-bush.gc b/goal_src/jak3/levels/desert/des-bush.gc index 9872a6635..7417d9dbe 100644 --- a/goal_src/jak3/levels/desert/des-bush.gc +++ b/goal_src/jak3/levels/desert/des-bush.gc @@ -1351,7 +1351,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "~S") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-07f6) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id kills) #f)) (s5-0 gp-1 s4-0 *temp-string*) ) 0 diff --git a/goal_src/jak3/levels/desert/wvehicle/wvehicle-util.gc b/goal_src/jak3/levels/desert/wvehicle/wvehicle-util.gc index 9f4ea38f8..f63089149 100644 --- a/goal_src/jak3/levels/desert/wvehicle/wvehicle-util.gc +++ b/goal_src/jak3/levels/desert/wvehicle/wvehicle-util.gc @@ -237,7 +237,7 @@ ) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text - (lookup-text! *common-text* (text-id text-0779) #f) + (lookup-text! *common-text* (text-id press-to-use) #f) gp-0 #f 44 @@ -308,13 +308,7 @@ (let ((a0-12 gp-0)) (set! (-> a0-12 color) (font-color default)) ) - (print-game-text - (lookup-text! *common-text* (text-id text-0887) #f) - gp-0 - #f - 44 - (bucket-id hud-draw-hud-alpha) - ) + (print-game-text (lookup-text! *common-text* (text-id locked) #f) gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) 0 diff --git a/goal_src/jak3/levels/gungame/gungame-manager.gc b/goal_src/jak3/levels/gungame/gungame-manager.gc index 3b87bd6a8..74777eecc 100644 --- a/goal_src/jak3/levels/gungame/gungame-manager.gc +++ b/goal_src/jak3/levels/gungame/gungame-manager.gc @@ -1301,7 +1301,7 @@ :start-gun 30 :ammo-type 15 :training-task #x84 - :play-text (text-id text-07e7) + :play-text (text-id press-to-play-beam-reflexor-training) :play-button (new 'static 'handle :process #x4000 :u64 #x4000) :give-eggs? #t ) @@ -1319,7 +1319,7 @@ :start-gun 27 :ammo-type 16 :training-task #xa2 - :play-text (text-id text-07e6) + :play-text (text-id press-to-play-wave-concussor-training) :play-button (new 'static 'handle :process #x4000 :u64 #x4000) :give-eggs? #t ) @@ -1337,7 +1337,7 @@ :start-gun 30 :ammo-type 15 :training-task #xa2 - :play-text (text-id text-07e8) + :play-text (text-id wave-concussor-training-ratchet-gun-course) :play-button (new 'static 'handle :process #x8000 :u64 #x8000) :give-eggs? #f ) @@ -1355,7 +1355,7 @@ :start-gun 27 :ammo-type 16 :training-task #xa2 - :play-text (text-id text-07e9) + :play-text (text-id beam-reflexor-training-clank-gun-course) :play-button (new 'static 'handle :process #x8000 :u64 #x8000) :give-eggs? #f ) diff --git a/goal_src/jak3/levels/precursor/precura-obs2.gc b/goal_src/jak3/levels/precursor/precura-obs2.gc index 5a8c60966..cca8cd359 100644 --- a/goal_src/jak3/levels/precursor/precura-obs2.gc +++ b/goal_src/jak3/levels/precursor/precura-obs2.gc @@ -838,7 +838,7 @@ (set! (-> v1-11 scale) 0.9) ) (let ((s5-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-077c) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id press-to-throw-held-objects) #f)) (s5-0 *temp-string* gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) diff --git a/goal_src/jak3/levels/temple/temple-obs2.gc b/goal_src/jak3/levels/temple/temple-obs2.gc index 6c7e56a52..0a2cbaeb6 100644 --- a/goal_src/jak3/levels/temple/temple-obs2.gc +++ b/goal_src/jak3/levels/temple/temple-obs2.gc @@ -508,8 +508,8 @@ (lookup-text! *common-text* (if (or (not (focus-test? *target* gun)) (!= (-> *game-info* gun-type) 27)) - (text-id text-07c3) - (text-id text-0885) + (text-id use-the-wave-concussor) + (text-id hold-to-charge-and-then-release-to-fire-blast) ) #f ) diff --git a/goal_src/jak3/levels/title/title-obs.gc b/goal_src/jak3/levels/title/title-obs.gc index 404cae1a6..95ce2230b 100644 --- a/goal_src/jak3/levels/title/title-obs.gc +++ b/goal_src/jak3/levels/title/title-obs.gc @@ -1494,7 +1494,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bd) + :text-id (text-id museum-jakc) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f :outtake (new 'static 'boxed-array :type string "jakout01" "jakout02" "jakout03" "jakout04") @@ -1507,7 +1507,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-07c1) + :text-id (text-id museum-ashelin) :outtake (new 'static 'boxed-array :type string "ashout01" "ashout02" @@ -1526,7 +1526,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07fa) + :text-id (text-id museum-keira) ) (new 'static 'museum-char :skel "skel-kleever-highres" @@ -1536,7 +1536,7 @@ :zoom-min 10240.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-07f7) + :text-id (text-id museum-kleever) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f ) @@ -1548,7 +1548,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0801) + :text-id (text-id museum-onin) ) (new 'static 'museum-char :skel "skel-ottsel-daxpants" @@ -1558,7 +1558,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07be) + :text-id (text-id museum-daxter) :outtake (new 'static 'boxed-array :type string "daxout01" "daxout02" @@ -1577,7 +1577,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-07bf) + :text-id (text-id museum-pecker) :outtake (new 'static 'boxed-array :type string "pekout01") ) (new 'static 'museum-char @@ -1588,7 +1588,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07f8) + :text-id (text-id museum-samos) ) (new 'static 'museum-char :skel "skel-seem-highres" @@ -1598,7 +1598,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07f9) + :text-id (text-id museum-seem) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #t ) @@ -1610,7 +1610,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07c2) + :text-id (text-id museum-tess) :outtake (new 'static 'boxed-array :type string "tesout01" "tesout02" "tesout03" "tesout04" "tesout05") ) (new 'static 'museum-char @@ -1621,7 +1621,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-07c0) + :text-id (text-id museum-torn) :outtake (new 'static 'boxed-array :type string "torout01" "torout02") ) (new 'static 'museum-char @@ -1632,7 +1632,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0804) + :text-id (text-id museum-cyber-errol) ) (new 'static 'museum-char :skel "skel-jinx-highres" @@ -1642,7 +1642,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-0803) + :text-id (text-id museum-jinx) ) (new 'static 'museum-char :skel "skel-damus-highres" @@ -1652,7 +1652,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0802) + :text-id (text-id museum-damus) :cloth-reset-time (seconds 0.4) :use-orient-cloth-reset? #f ) @@ -1664,7 +1664,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-07fd) + :text-id (text-id museum-sig) ) (new 'static 'museum-char :skel "skel-veger-highres" @@ -1674,7 +1674,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-0805) + :text-id (text-id museum-veger) :cloth-reset-time (seconds 0.4) :use-orient-cloth-reset? #f ) @@ -1686,7 +1686,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fb) + :text-id (text-id museum-ottsel-dummy) ) (new 'static 'museum-char :skel "skel-ottsel-leader" @@ -1696,7 +1696,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fe) + :text-id (text-id museum-ottsel-leader) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f ) @@ -1708,7 +1708,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07ff) + :text-id (text-id museum-ottsel-surfer) ) (new 'static 'museum-char :skel "skel-ottsel-tess" @@ -1718,7 +1718,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fc) + :text-id (text-id museum-ottsel-tess) ) (new 'static 'museum-char :skel "skel-ottsel-veger" @@ -1728,7 +1728,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-0800) + :text-id (text-id museum-ottsel-veger) ) ) ) @@ -1818,7 +1818,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bc) + :text-id (text-id museum-jak) :outtake (new 'static 'boxed-array :type string "jakout01" "jakout02" "jakout03" "jakout04") ) (new 'static 'museum-char @@ -1829,7 +1829,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07be) + :text-id (text-id museum-daxter) :outtake (new 'static 'boxed-array :type string "daxout01" "daxout02" @@ -1849,7 +1849,7 @@ :zoom-min 12288.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0894) + :text-id (text-id museum-vin) :outtake (new 'static 'boxed-array :type string "vinout01" "vinout02" "vinout03") ) (new 'static 'museum-char @@ -1860,7 +1860,7 @@ :zoom-min 12288.0 :zoom-max 28672.0 :scale 1.0 - :text-id (text-id text-0893) + :text-id (text-id museum-krew) :outtake (new 'static 'boxed-array :type string "krwout01" "krwout02" "krwout03" "krwout04" "krwout05") ) (new 'static 'museum-char @@ -1871,7 +1871,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-0830) + :text-id (text-id museum-errol) ) (new 'static 'museum-char :skel "skel-youngsamos-highres" @@ -1881,7 +1881,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-0817) + :text-id (text-id museum-youngsamos) ) (new 'static 'museum-char :skel "skel-kor-highres" @@ -1891,7 +1891,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-082f) + :text-id (text-id museum-kor) ) (new 'static 'museum-char :skel "skel-kid-highres" @@ -1901,7 +1901,7 @@ :zoom-min 4096.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-082e) + :text-id (text-id museum-kid) ) (new 'static 'museum-char :skel "skel-baron-highres" @@ -1911,7 +1911,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0816) + :text-id (text-id museum-baron) :outtake (new 'static 'boxed-array :type string "barout01" "barout02" "barout03" "barout04" "barout05") ) (new 'static 'museum-char @@ -1922,7 +1922,7 @@ :zoom-min 12288.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0819) + :text-id (text-id museum-red-crimson-guard) ) (new 'static 'museum-char :skel "skel-brutter-highres" @@ -1932,7 +1932,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0818) + :text-id (text-id museum-brutter) ) (new 'static 'museum-char :skel "skel-crocadog-highres" @@ -1942,7 +1942,7 @@ :zoom-min 12288.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-082d) + :text-id (text-id museum-crocadog) ) ) ) @@ -2082,7 +2082,7 @@ :zoom-min 4096.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bb) + :text-id (text-id museum-jak-one) ) (new 'static 'museum-char :skel "skel-warrior" @@ -2092,7 +2092,7 @@ :zoom-min 12288.0 :zoom-max 32768.0 :scale 1.0 - :text-id (text-id text-0820) + :text-id (text-id museum-warrior) ) (new 'static 'museum-char :skel "skel-evilsis" @@ -2102,7 +2102,7 @@ :zoom-min 6144.0 :zoom-max 18432.0 :scale 0.8 - :text-id (text-id text-0829) + :text-id (text-id museum-evilsis) ) (new 'static 'museum-char :skel "skel-evilbro" @@ -2111,7 +2111,7 @@ :zoom-min 6144.0 :zoom-max 18432.0 :scale 0.8 - :text-id (text-id text-0828) + :text-id (text-id museum-evilbro) ) (new 'static 'museum-char :skel "skel-bird-lady" @@ -2121,7 +2121,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0826) + :text-id (text-id museum-bird-lady) ) (new 'static 'museum-char :skel "skel-explorer" @@ -2131,7 +2131,7 @@ :zoom-min 4096.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-082a) + :text-id (text-id museum-explorer) ) (new 'static 'museum-char :skel "skel-billy" @@ -2141,7 +2141,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0832) + :text-id (text-id museum-billy) ) (new 'static 'museum-char :skel "skel-farmer" @@ -2151,7 +2151,7 @@ :zoom-min 12288.0 :zoom-max 28672.0 :scale 0.8 - :text-id (text-id text-082b) + :text-id (text-id museum-farmer) ) (new 'static 'museum-char :skel "skel-fisher" @@ -2161,7 +2161,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-082c) + :text-id (text-id museum-fisher) ) (new 'static 'museum-char :skel "skel-mayor" @@ -2171,7 +2171,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-081b) + :text-id (text-id museum-mayor) ) (new 'static 'museum-char :skel "skel-minershort" @@ -2181,7 +2181,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0823) + :text-id (text-id museum-minershort) ) (new 'static 'museum-char :skel "skel-minertall" @@ -2191,7 +2191,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0824) + :text-id (text-id museum-minertall) ) (new 'static 'museum-char :skel "skel-gambler" @@ -2201,7 +2201,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0822) + :text-id (text-id museum-gambler) ) (new 'static 'museum-char :skel "skel-ogreboss" @@ -2211,7 +2211,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.1 - :text-id (text-id text-0825) + :text-id (text-id museum-ogreboss) ) (new 'static 'museum-char :skel "skel-sculptor" @@ -2221,7 +2221,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-081d) + :text-id (text-id museum-sculptor) ) (new 'static 'museum-char :skel "skel-redsage" @@ -2231,7 +2231,7 @@ :zoom-min 10240.0 :zoom-max 22528.0 :scale 0.8 - :text-id (text-id text-081c) + :text-id (text-id museum-redsage) ) (new 'static 'museum-char :skel "skel-yellowsage" @@ -2241,7 +2241,7 @@ :zoom-min 10240.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-081f) + :text-id (text-id museum-yellowsage) ) (new 'static 'museum-char :skel "skel-sidekick-human" @@ -2251,7 +2251,7 @@ :zoom-min 4096.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-081e) + :text-id (text-id museum-sidekick-human) ) (new 'static 'museum-char :skel "skel-geologist" @@ -2261,7 +2261,7 @@ :zoom-min 4096.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0821) + :text-id (text-id museum-geologist) ) (new 'static 'museum-char :skel "skel-bluesage" @@ -2271,7 +2271,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 0.8 - :text-id (text-id text-0827) + :text-id (text-id museum-bluesage) ) (new 'static 'museum-char :skel "skel-babak" @@ -2281,7 +2281,7 @@ :zoom-min 12288.0 :zoom-max 22528.0 :scale 0.8 - :text-id (text-id text-0831) + :text-id (text-id museum-babak) ) (new 'static 'museum-char :skel "skel-flutflut" @@ -2291,7 +2291,7 @@ :zoom-min 10240.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-081a) + :text-id (text-id museum-flutflut) ) ) ) @@ -2392,7 +2392,7 @@ ) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (let ((s5-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0806) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id credits-starring) #f)) (s5-0 *temp-string* gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) diff --git a/goal_src/jak3/levels/wascity/bbush/des-bush-time-chase.gc b/goal_src/jak3/levels/wascity/bbush/des-bush-time-chase.gc index 7e993e9de..99890fd97 100644 --- a/goal_src/jak3/levels/wascity/bbush/des-bush-time-chase.gc +++ b/goal_src/jak3/levels/wascity/bbush/des-bush-time-chase.gc @@ -1366,7 +1366,7 @@ (set! (-> a0-16 color) (-> this strings 1 color)) ) (let ((s4-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0861) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id extra-time) #f)) (s4-0 *temp-string* s5-3 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) @@ -1410,7 +1410,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0861) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id extra-time) #f)) *temp-string* (s5-0 gp-1 s4-0) ) diff --git a/goal_src/jak3/levels/wascity/palace/waspala-obs.gc b/goal_src/jak3/levels/wascity/palace/waspala-obs.gc index 046171720..fc183a3fc 100644 --- a/goal_src/jak3/levels/wascity/palace/waspala-obs.gc +++ b/goal_src/jak3/levels/wascity/palace/waspala-obs.gc @@ -220,7 +220,7 @@ ) (send-event *target* 'end-mode 'grab) (until v1-29 - (draw-text self (text-id text-07c4)) + (draw-text self (text-id hold-to-charge-and-then-release-to-fire-bigger-blast)) (if (< (get-remaining-player-ammo (pickup-type ammo-red)) 60.0) (adjust-player-ammo 500.0 (pickup-type ammo-red)) ) diff --git a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc index ed14d04b2..9e136388b 100644 --- a/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc +++ b/goal_src/jak3/levels/wascity/wasstadium/wasstadc-obs.gc @@ -2919,7 +2919,7 @@ (set! (-> v1-46 scale) 0.7) ) (let ((s4-1 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-085a) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id dark-bomb-how-to) #f)) (s4-1 *temp-string* s5-1 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) diff --git a/test/decompiler/reference/jak3/engine/ambient/ambient-h_REF.gc b/test/decompiler/reference/jak3/engine/ambient/ambient-h_REF.gc index 7c5edf053..4ddfc416b 100644 --- a/test/decompiler/reference/jak3/engine/ambient/ambient-h_REF.gc +++ b/test/decompiler/reference/jak3/engine/ambient/ambient-h_REF.gc @@ -110,7 +110,7 @@ :speech #x1 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -121,7 +121,7 @@ :speech #x2 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -132,7 +132,7 @@ :speech #x3 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040b) + :text-message (text-id press-or-to-attack) :on-close #f :camera #f ) @@ -143,7 +143,7 @@ :speech #x4 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040b) + :text-message (text-id press-or-to-attack) :on-close #f :camera #f ) @@ -163,7 +163,7 @@ :speech #x6 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -183,7 +183,7 @@ :speech #x8 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -194,7 +194,7 @@ :speech #x9 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -205,7 +205,7 @@ :speech #xa :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -216,7 +216,7 @@ :speech #xb :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -227,7 +227,7 @@ :speech #xc :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -256,7 +256,7 @@ :speech #xf :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -267,7 +267,7 @@ :speech #x10 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -278,7 +278,7 @@ :speech #x11 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -289,7 +289,7 @@ :speech #x12 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -309,7 +309,7 @@ :speech #x14 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -351,7 +351,7 @@ :speech #x18 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -763,7 +763,7 @@ :speech #x44 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -774,7 +774,7 @@ :speech #x45 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -785,7 +785,7 @@ :speech #x46 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-0409) + :text-message (text-id roll-how-to) :on-close #f :camera #f ) @@ -807,7 +807,7 @@ :speech #x48 :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040a) + :text-message (text-id double-jump-how-to) :on-close #f :camera #f ) @@ -829,7 +829,7 @@ :speech #x4a :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -840,7 +840,7 @@ :speech #x4b :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -851,7 +851,7 @@ :speech #x4c :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -862,7 +862,7 @@ :speech #x4d :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -873,7 +873,7 @@ :speech #x4e :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -884,7 +884,7 @@ :speech #x4f :text-duration (seconds 1) :neg #x1 - :text-message (text-id text-040d) + :text-message (text-id ground-pound-how-to) :on-close #f :camera #f ) @@ -1014,7 +1014,7 @@ :speech #x5c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0888) + :text-message (text-id use-turbo-to-break-obstacles) :on-close #f :camera #f ) @@ -1140,7 +1140,7 @@ :speech #x69 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-06df) + :text-message (text-id activate-statue-by-punching-kicking-nose) :on-close #f :camera #f ) @@ -1495,7 +1495,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-07ba) + :text-message (text-id you-can-now-afford-to-purchase-new-secrets) :on-close #f :camera #f ) @@ -1507,7 +1507,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0857) + :text-message (text-id new-secrets-available) :on-close #f :camera #f ) @@ -1519,7 +1519,7 @@ :text-duration (seconds 5) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0858) + :text-message (text-id secrets-still-available) :on-close #f :camera #f ) @@ -1531,7 +1531,7 @@ :text-duration (seconds 10) :delay (seconds 1) :neg #x1 - :text-message (text-id text-0892) + :text-message (text-id congrats-600-orbs-new-duds) :on-close #f :camera #f ) @@ -1699,7 +1699,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -1710,7 +1710,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040e) + :text-message (text-id high-jump-how-to) :on-close #f :camera #f ) @@ -1721,7 +1721,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -1732,7 +1732,7 @@ :text-duration (seconds 5) :pos #x3 :neg #x1 - :text-message (text-id text-040c) + :text-message (text-id roll-jump-how-to) :on-close #f :camera #f ) @@ -3253,7 +3253,7 @@ :speech #x15c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-077b) + :text-message (text-id press-to-grab-objects) :on-close #f :camera #f ) @@ -3264,7 +3264,7 @@ :speech #x15d :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0807) + :text-message (text-id press-to-place-held-objects) :on-close #f :camera #f ) @@ -3275,7 +3275,7 @@ :speech #x15e :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0864) + :text-message (text-id hold-to-use-shield) :on-close #f :camera #f ) @@ -3305,7 +3305,7 @@ :speech #x161 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07b4) + :text-message (text-id dark-strike-how-to) :on-close #f :camera #f ) @@ -3316,7 +3316,7 @@ :speech #x162 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07c3) + :text-message (text-id use-the-wave-concussor) :on-close #f :camera #f ) @@ -3327,7 +3327,7 @@ :speech #x163 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07c4) + :text-message (text-id hold-to-charge-and-then-release-to-fire-bigger-blast) :on-close #f :camera #f ) @@ -3392,7 +3392,7 @@ :speech #x16a :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0862) + :text-message (text-id hold-to-auto-fire) :on-close #f :camera #f ) @@ -3412,7 +3412,7 @@ :speech #x16c :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-0886) + :text-message (text-id press-again-to-make-gyro-burster-hover-in-place) :on-close #f :camera #f ) diff --git a/test/decompiler/reference/jak3/levels/city/common/trail-graph_REF.gc b/test/decompiler/reference/jak3/levels/city/common/trail-graph_REF.gc index 66e077179..abda08bd8 100644 --- a/test/decompiler/reference/jak3/levels/city/common/trail-graph_REF.gc +++ b/test/decompiler/reference/jak3/levels/city/common/trail-graph_REF.gc @@ -2119,7 +2119,3 @@ :cell-pov-bit-arrays #f ) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/city/ctywide-obs_REF.gc b/test/decompiler/reference/jak3/levels/city/ctywide-obs_REF.gc index 027fb8141..9a2beee39 100644 --- a/test/decompiler/reference/jak3/levels/city/ctywide-obs_REF.gc +++ b/test/decompiler/reference/jak3/levels/city/ctywide-obs_REF.gc @@ -3454,7 +3454,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "~S") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0866) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id score) #f)) (s5-0 gp-1 s4-0 *temp-string*) ) 0 @@ -3955,7 +3955,3 @@ ) ) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/city/port/attack/ctyport-attack_REF.gc b/test/decompiler/reference/jak3/levels/city/port/attack/ctyport-attack_REF.gc index 758bcd8d9..fa72d9efe 100644 --- a/test/decompiler/reference/jak3/levels/city/port/attack/ctyport-attack_REF.gc +++ b/test/decompiler/reference/jak3/levels/city/port/attack/ctyport-attack_REF.gc @@ -393,7 +393,7 @@ :speech #x30 :text-duration (seconds 3) :neg #x1 - :text-message (text-id text-0408) + :text-message (text-id press-to-jump) :on-close #f :camera #f ) @@ -3301,7 +3301,3 @@ (call-parent-method this) (none) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/city/protect/assault-shared_REF.gc b/test/decompiler/reference/jak3/levels/city/protect/assault-shared_REF.gc index 4e813d187..9558c4508 100644 --- a/test/decompiler/reference/jak3/levels/city/protect/assault-shared_REF.gc +++ b/test/decompiler/reference/jak3/levels/city/protect/assault-shared_REF.gc @@ -194,7 +194,7 @@ :speech #xd :text-duration (seconds 4) :neg #x1 - :text-message (text-id text-06de) + :text-message (text-id protect-civilians) :on-close #f :camera #f ) @@ -289,7 +289,3 @@ ;; failed to figure out what this is: 0 - - - - diff --git a/test/decompiler/reference/jak3/levels/city/vinroom/power-game_REF.gc b/test/decompiler/reference/jak3/levels/city/vinroom/power-game_REF.gc index 6ea6c6af3..520f57524 100644 --- a/test/decompiler/reference/jak3/levels/city/vinroom/power-game_REF.gc +++ b/test/decompiler/reference/jak3/levels/city/vinroom/power-game_REF.gc @@ -896,7 +896,7 @@ :speech #x1 :text-duration (seconds 5) :neg #x1 - :text-message (text-id text-07b9) + :text-message (text-id hold-to-increase-speed) :on-close #f :camera #f ) @@ -3861,7 +3861,3 @@ #f ) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/comb/comb-obs_REF.gc b/test/decompiler/reference/jak3/levels/comb/comb-obs_REF.gc index a44932da3..2e0b5313e 100644 --- a/test/decompiler/reference/jak3/levels/comb/comb-obs_REF.gc +++ b/test/decompiler/reference/jak3/levels/comb/comb-obs_REF.gc @@ -1332,7 +1332,7 @@ ) (let ((gp-0 (current-time))) (until (time-elapsed? gp-0 (seconds 6)) - (print-text self (text-id text-0776)) + (print-text self (text-id light-jak-shield-how-to)) (suspend) ) ) @@ -1340,7 +1340,3 @@ (go-virtual complete) ) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/desert/des-bbush-tasks_REF.gc b/test/decompiler/reference/jak3/levels/desert/des-bbush-tasks_REF.gc index e79788c14..889ceaa2a 100644 --- a/test/decompiler/reference/jak3/levels/desert/des-bbush-tasks_REF.gc +++ b/test/decompiler/reference/jak3/levels/desert/des-bbush-tasks_REF.gc @@ -636,7 +636,7 @@ :fail (new 'static 'resetter-spec :continue #f :reset-mode 'life :execute #f) :retry (new 'static 'resetter-spec :continue "desert-bbush-desc-4" :reset-mode 'try :execute #f) :reset-delay (seconds 6.5) - :text-message (text-id text-07cc) + :text-message (text-id out-of-time) ) ) @@ -681,7 +681,7 @@ (let ((gp-3 (on-fail self 'fail))) (when gp-3 (mem-copy! (the-as pointer *bbv-fail-time-expired*) (the-as pointer gp-3) 48) - (set! (-> gp-3 text-message) (text-id text-07cc)) + (set! (-> gp-3 text-message) (text-id out-of-time)) ) ) (go-virtual fail *bbv-fail-time-expired*) @@ -801,7 +801,7 @@ (set! (-> this display-units) 0.00024414062) (set! (-> this time-limit) (seconds 30)) (set! (-> this game-score) (the-as uint 6)) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-0833)) + (set! (-> *wasbbv-hud-info* score-text) (text-id your-distance)) (set! (-> *wasbbv-hud-info* decimal-place-count) 1) (none) ) @@ -843,7 +843,7 @@ (set! (-> this display-units) 0.00024414062) (set! (-> this time-limit) (seconds 60)) (set! (-> this game-score) (the-as uint 7)) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07ce)) + (set! (-> *wasbbv-hud-info* score-text) (text-id total-distance)) (set! (-> *wasbbv-hud-info* decimal-place-count) 1) (none) ) @@ -890,7 +890,7 @@ (set! (-> this time-limit) (seconds 60)) (set! (-> this game-score) (the-as uint 8)) (set! (-> this want-current-hud?) #f) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07cd)) + (set! (-> *wasbbv-hud-info* score-text) (text-id total-rolls)) (set! (-> *wasbbv-hud-info* decimal-place-count) 0) 0 (none) @@ -948,7 +948,7 @@ (set! (-> this game-score) (the-as uint 16)) (set! (-> this want-current-hud?) #f) (set! (-> this max-reserve-count) 1000) - (set! (-> *wasbbv-hud-info* score-text) (text-id text-07f6)) + (set! (-> *wasbbv-hud-info* score-text) (text-id kills)) (set! (-> *wasbbv-hud-info* decimal-place-count) 0) (set! (-> *was-squad-control* target-count) 0) 0 @@ -991,7 +991,3 @@ (talker-spawn-func (-> *talker-speech* 317) *entity-pool* (target-pos 0) (the-as region #f)) (none) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/desert/des-burning-bush_REF.gc b/test/decompiler/reference/jak3/levels/desert/des-burning-bush_REF.gc index 8074e7a7a..2873b6f0f 100644 --- a/test/decompiler/reference/jak3/levels/desert/des-burning-bush_REF.gc +++ b/test/decompiler/reference/jak3/levels/desert/des-burning-bush_REF.gc @@ -133,7 +133,7 @@ (define *bbush-menu* (new 'static 'bbush-menu :title-text (text-id text-0624) - :req-text (text-id text-0860) + :req-text (text-id bring-sand-shark-heat-seeker-dust-demon-desert-screamer) :req-check (lambda () (case (-> *game-info* current-vehicle) (((vehicle-type-u8 v-snake) (vehicle-type-u8 v-fox) (vehicle-type-u8 v-mirage) (vehicle-type-u8 v-x-ride)) @@ -341,7 +341,7 @@ ) ) (print-game-text - (lookup-text! *common-text* (text-id text-085f) #f) + (lookup-text! *common-text* (text-id bring-sand-shark) #f) s5-1 #f 44 diff --git a/test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc b/test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc index e2dac8d09..e6966d87b 100644 --- a/test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc +++ b/test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc @@ -1545,7 +1545,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "~S") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-07f6) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id kills) #f)) (s5-0 gp-1 s4-0 *temp-string*) ) 0 @@ -3225,7 +3225,3 @@ #f ) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/desert/wvehicle/wvehicle-util_REF.gc b/test/decompiler/reference/jak3/levels/desert/wvehicle/wvehicle-util_REF.gc index e546700f2..33c6149cb 100644 --- a/test/decompiler/reference/jak3/levels/desert/wvehicle/wvehicle-util_REF.gc +++ b/test/decompiler/reference/jak3/levels/desert/wvehicle/wvehicle-util_REF.gc @@ -243,7 +243,7 @@ ) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (print-game-text - (lookup-text! *common-text* (text-id text-0779) #f) + (lookup-text! *common-text* (text-id press-to-use) #f) gp-0 #f 44 @@ -316,13 +316,7 @@ (let ((a0-12 gp-0)) (set! (-> a0-12 color) (font-color default)) ) - (print-game-text - (lookup-text! *common-text* (text-id text-0887) #f) - gp-0 - #f - 44 - (bucket-id hud-draw-hud-alpha) - ) + (print-game-text (lookup-text! *common-text* (text-id locked) #f) gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) 0 diff --git a/test/decompiler/reference/jak3/levels/gungame/gungame-manager_REF.gc b/test/decompiler/reference/jak3/levels/gungame/gungame-manager_REF.gc index 347c1f487..bcac76331 100644 --- a/test/decompiler/reference/jak3/levels/gungame/gungame-manager_REF.gc +++ b/test/decompiler/reference/jak3/levels/gungame/gungame-manager_REF.gc @@ -1497,7 +1497,7 @@ :start-gun 30 :ammo-type 15 :training-task #x84 - :play-text (text-id text-07e7) + :play-text (text-id press-to-play-beam-reflexor-training) :play-button (new 'static 'handle :process #x4000 :u64 #x4000) :give-eggs? #t ) @@ -1515,7 +1515,7 @@ :start-gun 27 :ammo-type 16 :training-task #xa2 - :play-text (text-id text-07e6) + :play-text (text-id press-to-play-wave-concussor-training) :play-button (new 'static 'handle :process #x4000 :u64 #x4000) :give-eggs? #t ) @@ -1533,7 +1533,7 @@ :start-gun 30 :ammo-type 15 :training-task #xa2 - :play-text (text-id text-07e8) + :play-text (text-id wave-concussor-training-ratchet-gun-course) :play-button (new 'static 'handle :process #x8000 :u64 #x8000) :give-eggs? #f ) @@ -1551,7 +1551,7 @@ :start-gun 27 :ammo-type 16 :training-task #xa2 - :play-text (text-id text-07e9) + :play-text (text-id beam-reflexor-training-clank-gun-course) :play-button (new 'static 'handle :process #x8000 :u64 #x8000) :give-eggs? #f ) diff --git a/test/decompiler/reference/jak3/levels/precursor/precura-obs2_REF.gc b/test/decompiler/reference/jak3/levels/precursor/precura-obs2_REF.gc index 744fa21af..d10436112 100644 --- a/test/decompiler/reference/jak3/levels/precursor/precura-obs2_REF.gc +++ b/test/decompiler/reference/jak3/levels/precursor/precura-obs2_REF.gc @@ -890,7 +890,7 @@ (set! (-> v1-11 scale) 0.9) ) (let ((s5-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-077c) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id press-to-throw-held-objects) #f)) (s5-0 *temp-string* gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) diff --git a/test/decompiler/reference/jak3/levels/temple/temple-obs2_REF.gc b/test/decompiler/reference/jak3/levels/temple/temple-obs2_REF.gc index dcc697f61..08a49474d 100644 --- a/test/decompiler/reference/jak3/levels/temple/temple-obs2_REF.gc +++ b/test/decompiler/reference/jak3/levels/temple/temple-obs2_REF.gc @@ -556,8 +556,8 @@ (lookup-text! *common-text* (if (or (not (focus-test? *target* gun)) (!= (-> *game-info* gun-type) 27)) - (text-id text-07c3) - (text-id text-0885) + (text-id use-the-wave-concussor) + (text-id hold-to-charge-and-then-release-to-fire-blast) ) #f ) @@ -2274,7 +2274,3 @@ ((method-of-type process-focusable deactivate) (the-as process-focusable this)) (none) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/title/title-obs_REF.gc b/test/decompiler/reference/jak3/levels/title/title-obs_REF.gc index 90450da4c..58c8a3daf 100644 --- a/test/decompiler/reference/jak3/levels/title/title-obs_REF.gc +++ b/test/decompiler/reference/jak3/levels/title/title-obs_REF.gc @@ -1584,7 +1584,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bd) + :text-id (text-id museum-jakc) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f :outtake (new 'static 'boxed-array :type string "jakout01" "jakout02" "jakout03" "jakout04") @@ -1597,7 +1597,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-07c1) + :text-id (text-id museum-ashelin) :outtake (new 'static 'boxed-array :type string "ashout01" "ashout02" @@ -1616,7 +1616,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07fa) + :text-id (text-id museum-keira) ) (new 'static 'museum-char :skel "skel-kleever-highres" @@ -1626,7 +1626,7 @@ :zoom-min 10240.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-07f7) + :text-id (text-id museum-kleever) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f ) @@ -1638,7 +1638,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0801) + :text-id (text-id museum-onin) ) (new 'static 'museum-char :skel "skel-ottsel-daxpants" @@ -1648,7 +1648,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07be) + :text-id (text-id museum-daxter) :outtake (new 'static 'boxed-array :type string "daxout01" "daxout02" @@ -1667,7 +1667,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-07bf) + :text-id (text-id museum-pecker) :outtake (new 'static 'boxed-array :type string "pekout01") ) (new 'static 'museum-char @@ -1678,7 +1678,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07f8) + :text-id (text-id museum-samos) ) (new 'static 'museum-char :skel "skel-seem-highres" @@ -1688,7 +1688,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07f9) + :text-id (text-id museum-seem) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #t ) @@ -1700,7 +1700,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-07c2) + :text-id (text-id museum-tess) :outtake (new 'static 'boxed-array :type string "tesout01" "tesout02" "tesout03" "tesout04" "tesout05") ) (new 'static 'museum-char @@ -1711,7 +1711,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-07c0) + :text-id (text-id museum-torn) :outtake (new 'static 'boxed-array :type string "torout01" "torout02") ) (new 'static 'museum-char @@ -1722,7 +1722,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0804) + :text-id (text-id museum-cyber-errol) ) (new 'static 'museum-char :skel "skel-jinx-highres" @@ -1732,7 +1732,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-0803) + :text-id (text-id museum-jinx) ) (new 'static 'museum-char :skel "skel-damus-highres" @@ -1742,7 +1742,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0802) + :text-id (text-id museum-damus) :cloth-reset-time (seconds 0.4) :use-orient-cloth-reset? #f ) @@ -1754,7 +1754,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-07fd) + :text-id (text-id museum-sig) ) (new 'static 'museum-char :skel "skel-veger-highres" @@ -1764,7 +1764,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.0 - :text-id (text-id text-0805) + :text-id (text-id museum-veger) :cloth-reset-time (seconds 0.4) :use-orient-cloth-reset? #f ) @@ -1776,7 +1776,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fb) + :text-id (text-id museum-ottsel-dummy) ) (new 'static 'museum-char :skel "skel-ottsel-leader" @@ -1786,7 +1786,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fe) + :text-id (text-id museum-ottsel-leader) :cloth-reset-time (seconds 0.1) :use-orient-cloth-reset? #f ) @@ -1798,7 +1798,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07ff) + :text-id (text-id museum-ottsel-surfer) ) (new 'static 'museum-char :skel "skel-ottsel-tess" @@ -1808,7 +1808,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07fc) + :text-id (text-id museum-ottsel-tess) ) (new 'static 'museum-char :skel "skel-ottsel-veger" @@ -1818,7 +1818,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-0800) + :text-id (text-id museum-ottsel-veger) ) ) ) @@ -1921,7 +1921,7 @@ :zoom-min 8192.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bc) + :text-id (text-id museum-jak) :outtake (new 'static 'boxed-array :type string "jakout01" "jakout02" "jakout03" "jakout04") ) (new 'static 'museum-char @@ -1932,7 +1932,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-07be) + :text-id (text-id museum-daxter) :outtake (new 'static 'boxed-array :type string "daxout01" "daxout02" @@ -1952,7 +1952,7 @@ :zoom-min 12288.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0894) + :text-id (text-id museum-vin) :outtake (new 'static 'boxed-array :type string "vinout01" "vinout02" "vinout03") ) (new 'static 'museum-char @@ -1963,7 +1963,7 @@ :zoom-min 12288.0 :zoom-max 28672.0 :scale 1.0 - :text-id (text-id text-0893) + :text-id (text-id museum-krew) :outtake (new 'static 'boxed-array :type string "krwout01" "krwout02" "krwout03" "krwout04" "krwout05") ) (new 'static 'museum-char @@ -1974,7 +1974,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 1.0 - :text-id (text-id text-0830) + :text-id (text-id museum-errol) ) (new 'static 'museum-char :skel "skel-youngsamos-highres" @@ -1984,7 +1984,7 @@ :zoom-min 8192.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-0817) + :text-id (text-id museum-youngsamos) ) (new 'static 'museum-char :skel "skel-kor-highres" @@ -1994,7 +1994,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-082f) + :text-id (text-id museum-kor) ) (new 'static 'museum-char :skel "skel-kid-highres" @@ -2004,7 +2004,7 @@ :zoom-min 4096.0 :zoom-max 12288.0 :scale 1.0 - :text-id (text-id text-082e) + :text-id (text-id museum-kid) ) (new 'static 'museum-char :skel "skel-baron-highres" @@ -2014,7 +2014,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0816) + :text-id (text-id museum-baron) :outtake (new 'static 'boxed-array :type string "barout01" "barout02" "barout03" "barout04" "barout05") ) (new 'static 'museum-char @@ -2025,7 +2025,7 @@ :zoom-min 12288.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0819) + :text-id (text-id museum-red-crimson-guard) ) (new 'static 'museum-char :skel "skel-brutter-highres" @@ -2035,7 +2035,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-0818) + :text-id (text-id museum-brutter) ) (new 'static 'museum-char :skel "skel-crocadog-highres" @@ -2045,7 +2045,7 @@ :zoom-min 12288.0 :zoom-max 16384.0 :scale 1.0 - :text-id (text-id text-082d) + :text-id (text-id museum-crocadog) ) ) ) @@ -2207,7 +2207,7 @@ :zoom-min 4096.0 :zoom-max 18432.0 :scale 1.4 - :text-id (text-id text-07bb) + :text-id (text-id museum-jak-one) ) (new 'static 'museum-char :skel "skel-warrior" @@ -2217,7 +2217,7 @@ :zoom-min 12288.0 :zoom-max 32768.0 :scale 1.0 - :text-id (text-id text-0820) + :text-id (text-id museum-warrior) ) (new 'static 'museum-char :skel "skel-evilsis" @@ -2227,7 +2227,7 @@ :zoom-min 6144.0 :zoom-max 18432.0 :scale 0.8 - :text-id (text-id text-0829) + :text-id (text-id museum-evilsis) ) (new 'static 'museum-char :skel "skel-evilbro" @@ -2236,7 +2236,7 @@ :zoom-min 6144.0 :zoom-max 18432.0 :scale 0.8 - :text-id (text-id text-0828) + :text-id (text-id museum-evilbro) ) (new 'static 'museum-char :skel "skel-bird-lady" @@ -2246,7 +2246,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0826) + :text-id (text-id museum-bird-lady) ) (new 'static 'museum-char :skel "skel-explorer" @@ -2256,7 +2256,7 @@ :zoom-min 4096.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-082a) + :text-id (text-id museum-explorer) ) (new 'static 'museum-char :skel "skel-billy" @@ -2266,7 +2266,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0832) + :text-id (text-id museum-billy) ) (new 'static 'museum-char :skel "skel-farmer" @@ -2276,7 +2276,7 @@ :zoom-min 12288.0 :zoom-max 28672.0 :scale 0.8 - :text-id (text-id text-082b) + :text-id (text-id museum-farmer) ) (new 'static 'museum-char :skel "skel-fisher" @@ -2286,7 +2286,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-082c) + :text-id (text-id museum-fisher) ) (new 'static 'museum-char :skel "skel-mayor" @@ -2296,7 +2296,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-081b) + :text-id (text-id museum-mayor) ) (new 'static 'museum-char :skel "skel-minershort" @@ -2306,7 +2306,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0823) + :text-id (text-id museum-minershort) ) (new 'static 'museum-char :skel "skel-minertall" @@ -2316,7 +2316,7 @@ :zoom-min 8192.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0824) + :text-id (text-id museum-minertall) ) (new 'static 'museum-char :skel "skel-gambler" @@ -2326,7 +2326,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-0822) + :text-id (text-id museum-gambler) ) (new 'static 'museum-char :skel "skel-ogreboss" @@ -2336,7 +2336,7 @@ :zoom-min 8192.0 :zoom-max 16384.0 :scale 0.1 - :text-id (text-id text-0825) + :text-id (text-id museum-ogreboss) ) (new 'static 'museum-char :skel "skel-sculptor" @@ -2346,7 +2346,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 1.0 - :text-id (text-id text-081d) + :text-id (text-id museum-sculptor) ) (new 'static 'museum-char :skel "skel-redsage" @@ -2356,7 +2356,7 @@ :zoom-min 10240.0 :zoom-max 22528.0 :scale 0.8 - :text-id (text-id text-081c) + :text-id (text-id museum-redsage) ) (new 'static 'museum-char :skel "skel-yellowsage" @@ -2366,7 +2366,7 @@ :zoom-min 10240.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-081f) + :text-id (text-id museum-yellowsage) ) (new 'static 'museum-char :skel "skel-sidekick-human" @@ -2376,7 +2376,7 @@ :zoom-min 4096.0 :zoom-max 16384.0 :scale 0.8 - :text-id (text-id text-081e) + :text-id (text-id museum-sidekick-human) ) (new 'static 'museum-char :skel "skel-geologist" @@ -2386,7 +2386,7 @@ :zoom-min 4096.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-0821) + :text-id (text-id museum-geologist) ) (new 'static 'museum-char :skel "skel-bluesage" @@ -2396,7 +2396,7 @@ :zoom-min 8192.0 :zoom-max 24576.0 :scale 0.8 - :text-id (text-id text-0827) + :text-id (text-id museum-bluesage) ) (new 'static 'museum-char :skel "skel-babak" @@ -2406,7 +2406,7 @@ :zoom-min 12288.0 :zoom-max 22528.0 :scale 0.8 - :text-id (text-id text-0831) + :text-id (text-id museum-babak) ) (new 'static 'museum-char :skel "skel-flutflut" @@ -2416,7 +2416,7 @@ :zoom-min 10240.0 :zoom-max 20480.0 :scale 0.8 - :text-id (text-id text-081a) + :text-id (text-id museum-flutflut) ) ) ) @@ -2538,7 +2538,7 @@ ) (set! (-> gp-0 flags) (font-flags shadow kerning large)) (let ((s5-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0806) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id credits-starring) #f)) (s5-0 *temp-string* gp-0 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) @@ -2756,7 +2756,3 @@ ) :post target-no-move-post ) - - - - diff --git a/test/decompiler/reference/jak3/levels/wascity/bbush/des-bush-time-chase_REF.gc b/test/decompiler/reference/jak3/levels/wascity/bbush/des-bush-time-chase_REF.gc index 0130807e5..27c564eab 100644 --- a/test/decompiler/reference/jak3/levels/wascity/bbush/des-bush-time-chase_REF.gc +++ b/test/decompiler/reference/jak3/levels/wascity/bbush/des-bush-time-chase_REF.gc @@ -1573,7 +1573,7 @@ (set! (-> a0-16 color) (-> this strings 1 color)) ) (let ((s4-0 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0861) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id extra-time) #f)) (s4-0 *temp-string* s5-3 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) @@ -1621,7 +1621,7 @@ (gp-1 (clear (-> this strings 1 text))) (s4-0 "") ) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-0861) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id extra-time) #f)) *temp-string* (s5-0 gp-1 s4-0) ) @@ -2118,7 +2118,3 @@ 0 (none) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/wascity/palace/waspala-obs_REF.gc b/test/decompiler/reference/jak3/levels/wascity/palace/waspala-obs_REF.gc index e1163208f..5da0f85be 100644 --- a/test/decompiler/reference/jak3/levels/wascity/palace/waspala-obs_REF.gc +++ b/test/decompiler/reference/jak3/levels/wascity/palace/waspala-obs_REF.gc @@ -306,7 +306,7 @@ ) (send-event *target* 'end-mode 'grab) (until v1-29 - (draw-text self (text-id text-07c4)) + (draw-text self (text-id hold-to-charge-and-then-release-to-fire-bigger-blast)) (if (< (get-remaining-player-ammo (pickup-type ammo-red)) 60.0) (adjust-player-ammo 500.0 (pickup-type ammo-red)) ) @@ -406,7 +406,3 @@ (transform-post) (go (method-of-object this idle)) ) - - - - diff --git a/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc b/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc index faae30451..c4efc9eb7 100644 --- a/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc +++ b/test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc @@ -3187,7 +3187,7 @@ (set! (-> v1-46 scale) 0.7) ) (let ((s4-1 print-game-text)) - (format (clear *temp-string*) (lookup-text! *common-text* (text-id text-085a) #f)) + (format (clear *temp-string*) (lookup-text! *common-text* (text-id dark-bomb-how-to) #f)) (s4-1 *temp-string* s5-1 #f 44 (bucket-id hud-draw-hud-alpha)) ) ) diff --git a/test/decompiler/reference/jak3/levels/wascity/wastrail-graph_REF.gc b/test/decompiler/reference/jak3/levels/wascity/wastrail-graph_REF.gc index edf29d06a..2c53affdb 100644 --- a/test/decompiler/reference/jak3/levels/wascity/wastrail-graph_REF.gc +++ b/test/decompiler/reference/jak3/levels/wascity/wastrail-graph_REF.gc @@ -4140,7 +4140,3 @@ ) ) ) - - - -