jak2: fill out names for text-id enum (#2640)

This commit is contained in:
Hat Kid
2023-05-17 01:48:44 +02:00
committed by GitHub
parent 0dccd048ef
commit ebc90d57ed
36 changed files with 4422 additions and 2768 deletions
+7 -1
View File
@@ -1911,7 +1911,13 @@
)
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
(when (and (>= 1 (-> *game-info* auto-save-count)) (-> self next-state) (= (-> self next-state name) 'save))
(print-game-text (lookup-text! *common-text* (text-id text-x19f) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id progress-memcard-saving-data) #f)
gp-1
#f
44
(bucket-id progress)
)
(set! (-> gp-1 origin x) 20.0)
(set! (-> gp-1 origin y) 130.0)
(let ((v1-30 gp-1))
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1499,14 +1499,14 @@
(set! (-> v1-17 height) (the float 95))
)
(let ((s5-1 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x18a) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id try-again?) #f) 1)
(s5-1 *temp-string* gp-0 #f 44 (bucket-id progress))
)
(let ((v1-19 gp-0))
(set! (-> v1-19 height) (the float 155))
)
(let ((s5-2 print-game-text))
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x180) #f) 1)
(format (clear *temp-string*) (lookup-text! *common-text* (text-id yes-no-prompt) #f) 1)
(s5-2 *temp-string* gp-0 #f 44 (bucket-id progress))
)
)
@@ -380,7 +380,7 @@ Seen take in - `true-func` which takes no args TODO - seems fishy
;; WARN: Return type mismatch int vs none.
(defmethod process-taskable-method-32 process-taskable ((obj process-taskable))
(logior! (-> obj skel status) (joint-control-status eye-anim))
(set! (-> obj talk-message) (text-id text-x181))
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
(set! (-> obj bounce-away) #t)
(set! (-> obj will-talk) #t)
(set! (-> obj look-at-me) #t)
+7 -1
View File
@@ -202,7 +202,13 @@
(set! (-> v1-33 scale) 0.9)
)
(set! (-> gp-0 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-0 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-0
#f
44
(bucket-id progress)
)
)
(if (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'mech self (-> self shield-value)))
(go-virtual pickup (method-of-object self wait-for-return))
+7 -1
View File
@@ -1165,7 +1165,13 @@
(set! (-> v1-23 scale) 0.9)
)
(set! (-> gp-1 flags) (font-flags shadow kerning large))
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) gp-1 #f 44 (bucket-id progress))
(print-game-text
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
gp-1
#f
44
(bucket-id progress)
)
)
(when (and (cpad-pressed? 0 triangle) (send-event *target* 'change-mode 'turret self))
(set! (-> self rider) (process->handle *target*))
File diff suppressed because it is too large Load Diff
+11 -7
View File
@@ -3856,7 +3856,7 @@
(set! sv-48 0)
(while (< sv-48 s4-0)
(set! sv-64 print-game-text)
(let ((a0-4 (lookup-text! *common-text* (the-as text-id (-> s2-0 sv-48 text)) #f))
(let ((a0-4 (lookup-text! *common-text* (-> s2-0 sv-48 text) #f))
(a1-16 arg1)
(a2-4 #t)
(a3-3 44)
@@ -3869,7 +3869,7 @@
(let ((s0-1 (- s0-0 (the int f28-0)))
(f28-1 (cond
((< (-> arg0 sliding-height) 0.0)
(set! sv-112 (lookup-text! *common-text* (the-as text-id (-> s2-0 s4-0 text)) #f))
(set! sv-112 (lookup-text! *common-text* (-> s2-0 s4-0 text) #f))
0.0
(set! sv-80 print-game-text)
(set! sv-96 format)
@@ -3889,7 +3889,7 @@
)
)
(else
(set! sv-160 (lookup-text! *common-text* (the-as text-id (-> s2-0 (+ s4-0 -1) text)) #f))
(set! sv-160 (lookup-text! *common-text* (-> s2-0 (+ s4-0 -1) text) #f))
0.0
(set! sv-128 print-game-text)
(set! sv-144 format)
@@ -3914,7 +3914,7 @@
(set! (-> arg1 origin y) (the float (+ s0-1 (the int f28-1))))
(while (< s3-0 (length s2-0))
(set! sv-176 print-game-text)
(let* ((a0-14 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let* ((a0-14 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-24 arg1)
(a2-12 #t)
(a3-6 44)
@@ -3941,7 +3941,7 @@
)
)
(set! sv-224 print-game-text)
(let ((a0-23 (lookup-text! *common-text* (the-as text-id (-> s2-0 s3-0 text)) #f))
(let ((a0-23 (lookup-text! *common-text* (-> s2-0 s3-0 text) #f))
(a1-28 arg1)
(a2-16 #f)
(a3-7 44)
@@ -4229,8 +4229,8 @@
)
(set! (-> arg1 alpha) sv-16)
(set! (-> *game-info* mission-list 0) sv-264)
(set! (-> sv-264 description) (text-id progress-unknown-kjanskd))
(set! (-> sv-268 description) (text-id progress-unknown-oi1un23i13))
(set! (-> sv-264 description) (text-id progress-missions-in-progress))
(set! (-> sv-268 description) (text-id progress-missions-completed))
(while (< sv-24 (length (-> *game-info* sub-task-list)))
(let ((v1-26 (find-mission-text-at-index sv-24))
(a0-15 (-> *game-info* mission-list))
@@ -7983,3 +7983,7 @@
0
(none)
)
+4 -4
View File
@@ -962,10 +962,10 @@
;; definition of type secret-item-option
(deftype secret-item-option (menu-option)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag uint32 :offset-assert 56)
(avail-after uint16 :offset-assert 60)
((cost int32 :offset-assert 48)
(can-toggle symbol :offset-assert 52)
(flag game-secrets :offset-assert 56)
(avail-after game-task-node :offset-assert 60)
)
:method-count-assert 12
:size-assert #x3e
File diff suppressed because it is too large Load Diff