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

jak3 - fill out some text-id entries (#3494)

Browse Source 
Slam Dozer > Ram Rod
This commit is contained in:
Matt Dallmeyer
2024-05-30 18:49:10 -07:00
committed by GitHub
parent c64eea6337
commit 70ea2a1f67
38 changed files with 537 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/decompiler/reference/jak3/engine/ambient/ambient-h_REF.gc
Generated Vendored
+44 -44
View File
@@ -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
)
test/decompiler/reference/jak3/levels/city/common/trail-graph_REF.gc
Generated Vendored
-4
View File
@@ -2119,7 +2119,3 @@
:cell-pov-bit-arrays #f
)
)
test/decompiler/reference/jak3/levels/city/ctywide-obs_REF.gc
Generated Vendored
+1 -5
View File
@@ -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 @@
)
)
)
test/decompiler/reference/jak3/levels/city/port/attack/ctyport-attack_REF.gc
Generated Vendored
+1 -5
View File
@@ -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)
)
test/decompiler/reference/jak3/levels/city/protect/assault-shared_REF.gc
Generated Vendored
+1 -5
View File
@@ -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
test/decompiler/reference/jak3/levels/city/vinroom/power-game_REF.gc
Generated Vendored
+1 -5
View File
@@ -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
)
)
test/decompiler/reference/jak3/levels/comb/comb-obs_REF.gc
Generated Vendored
+1 -5
View File
@@ -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)
)
)
test/decompiler/reference/jak3/levels/desert/des-bbush-tasks_REF.gc
Generated Vendored
+6 -10
View File
@@ -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)
)
test/decompiler/reference/jak3/levels/desert/des-burning-bush_REF.gc
Generated Vendored
+2 -2
View File
@@ -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
test/decompiler/reference/jak3/levels/desert/des-bush_REF.gc
Generated Vendored
+1 -5
View File
@@ -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
)
)
test/decompiler/reference/jak3/levels/desert/wvehicle/wvehicle-util_REF.gc
Generated Vendored
+2 -8
View File
@@ -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
test/decompiler/reference/jak3/levels/gungame/gungame-manager_REF.gc
Generated Vendored
+4 -4
View File
@@ -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
)
test/decompiler/reference/jak3/levels/precursor/precura-obs2_REF.gc
Generated Vendored
+1 -1
View File
@@ -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))
)
)
test/decompiler/reference/jak3/levels/temple/temple-obs2_REF.gc
Generated Vendored
+2 -6
View File
@@ -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)
)
test/decompiler/reference/jak3/levels/title/title-obs_REF.gc
Generated Vendored
+56 -60
View File
@@ -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
)
test/decompiler/reference/jak3/levels/wascity/bbush/des-bush-time-chase_REF.gc
Generated Vendored
+2 -6
View File
@@ -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)
)
test/decompiler/reference/jak3/levels/wascity/palace/waspala-obs_REF.gc
Generated Vendored
+1 -5
View File
@@ -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))
)
test/decompiler/reference/jak3/levels/wascity/wasstadium/wasstadc-obs_REF.gc
Generated Vendored
+1 -1
View File
@@ -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))
)
)
test/decompiler/reference/jak3/levels/wascity/wastrail-graph_REF.gc
Generated Vendored
-4
View File
@@ -4140,7 +4140,3 @@
)
)
)