mirror of
https://github.com/open-goal/jak-project
synced 2026-07-27 14:52:44 -04:00
jak2: fill out names for text-id enum (#2640)
This commit is contained in:
+7
-1
@@ -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))
|
||||
|
||||
+269
-269
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -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))
|
||||
)
|
||||
)
|
||||
|
||||
+1
-1
@@ -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
@@ -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
@@ -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*))
|
||||
|
||||
+1206
File diff suppressed because it is too large
Load Diff
+11
-7
@@ -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
@@ -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
|
||||
|
||||
+918
-864
File diff suppressed because it is too large
Load Diff
+9
-9
@@ -3254,7 +3254,7 @@ This commonly includes things such as:
|
||||
(set! (-> v1-39 scale) 0.9)
|
||||
)
|
||||
(let ((s4-1 print-game-text))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id text-x181) #f))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id press-triangle-to-talk) #f))
|
||||
(s4-1 *temp-string* s5-1 #f 44 (bucket-id progress))
|
||||
)
|
||||
)
|
||||
@@ -3693,7 +3693,7 @@ This commonly includes things such as:
|
||||
(let ((s0-0 print-game-text))
|
||||
(set! sv-352 format)
|
||||
(set! sv-368 (clear *temp-string*))
|
||||
(let ((a1-5 (lookup-text! *common-text* (text-id text-x278) #f)))
|
||||
(let ((a1-5 (lookup-text! *common-text* (text-id select-event) #f)))
|
||||
(sv-352 sv-368 a1-5)
|
||||
)
|
||||
(s0-0 *temp-string* s1-0 #f 44 (bucket-id progress))
|
||||
@@ -3729,7 +3729,7 @@ This commonly includes things such as:
|
||||
(set! sv-384 print-game-text)
|
||||
(set! sv-400 format)
|
||||
(set! sv-416 (clear *temp-string*))
|
||||
(let ((a1-9 (lookup-text! *common-text* (text-id text-x30f) #f)))
|
||||
(let ((a1-9 (lookup-text! *common-text* (text-id board-name) #f)))
|
||||
(sv-400 sv-416 a1-9)
|
||||
)
|
||||
(let ((a0-73 *temp-string*)
|
||||
@@ -3745,7 +3745,7 @@ This commonly includes things such as:
|
||||
(set! sv-432 print-game-text)
|
||||
(set! sv-448 format)
|
||||
(set! sv-464 (clear *temp-string*))
|
||||
(let ((a1-12 (lookup-text! *common-text* (text-id text-x27a) #f)))
|
||||
(let ((a1-12 (lookup-text! *common-text* (text-id race-class3) #f)))
|
||||
(sv-448 sv-464 a1-12)
|
||||
)
|
||||
(let ((a0-79 *temp-string*)
|
||||
@@ -3761,7 +3761,7 @@ This commonly includes things such as:
|
||||
(set! sv-480 print-game-text)
|
||||
(set! sv-496 format)
|
||||
(set! sv-512 (clear *temp-string*))
|
||||
(let ((a1-15 (lookup-text! *common-text* (text-id text-x27b) #f)))
|
||||
(let ((a1-15 (lookup-text! *common-text* (text-id race-class2) #f)))
|
||||
(sv-496 sv-512 a1-15)
|
||||
)
|
||||
(let ((a0-85 *temp-string*)
|
||||
@@ -3777,7 +3777,7 @@ This commonly includes things such as:
|
||||
(set! sv-528 print-game-text)
|
||||
(set! sv-544 format)
|
||||
(set! sv-560 (clear *temp-string*))
|
||||
(let ((a1-18 (lookup-text! *common-text* (text-id text-x27c) #f)))
|
||||
(let ((a1-18 (lookup-text! *common-text* (text-id race-class1) #f)))
|
||||
(sv-544 sv-560 a1-18)
|
||||
)
|
||||
(let ((a0-91 *temp-string*)
|
||||
@@ -3793,7 +3793,7 @@ This commonly includes things such as:
|
||||
(set! sv-576 print-game-text)
|
||||
(set! sv-592 format)
|
||||
(set! sv-608 (clear *temp-string*))
|
||||
(let ((a1-21 (lookup-text! *common-text* (text-id text-x27d) #f)))
|
||||
(let ((a1-21 (lookup-text! *common-text* (text-id reverse-race-class3) #f)))
|
||||
(sv-592 sv-608 a1-21)
|
||||
)
|
||||
(let ((a0-97 *temp-string*)
|
||||
@@ -3809,7 +3809,7 @@ This commonly includes things such as:
|
||||
(set! sv-624 print-game-text)
|
||||
(set! sv-640 format)
|
||||
(set! sv-656 (clear *temp-string*))
|
||||
(let ((a1-24 (lookup-text! *common-text* (text-id text-x27e) #f)))
|
||||
(let ((a1-24 (lookup-text! *common-text* (text-id reverse-race-class2) #f)))
|
||||
(sv-640 sv-656 a1-24)
|
||||
)
|
||||
(let ((a0-103 *temp-string*)
|
||||
@@ -3825,7 +3825,7 @@ This commonly includes things such as:
|
||||
(set! sv-672 print-game-text)
|
||||
(set! sv-688 format)
|
||||
(set! sv-704 (clear *temp-string*))
|
||||
(let ((a1-27 (lookup-text! *common-text* (text-id text-x27f) #f)))
|
||||
(let ((a1-27 (lookup-text! *common-text* (text-id reverse-race-class1) #f)))
|
||||
(sv-688 sv-704 a1-27)
|
||||
)
|
||||
(let ((a0-108 *temp-string*)
|
||||
|
||||
+7
-1
@@ -400,7 +400,13 @@ This commonly includes things such as:
|
||||
(set! (-> v1-99 scale) 0.9)
|
||||
)
|
||||
(set! (-> s3-1 flags) (font-flags shadow kerning large))
|
||||
(print-game-text (lookup-text! *common-text* (text-id text-x182) #f) s3-1 #f 44 (bucket-id progress))
|
||||
(print-game-text
|
||||
(lookup-text! *common-text* (text-id press-triangle-to-use) #f)
|
||||
s3-1
|
||||
#f
|
||||
44
|
||||
(bucket-id progress)
|
||||
)
|
||||
)
|
||||
(when (cpad-pressed? 0 triangle)
|
||||
(cond
|
||||
|
||||
+3
-3
@@ -346,7 +346,7 @@
|
||||
)
|
||||
)
|
||||
(set! sv-112 print-game-text)
|
||||
(let ((a0-20 (lookup-text! *common-text* (text-id text-x175) #f))
|
||||
(let ((a0-20 (lookup-text! *common-text* (text-id race-you-win) #f))
|
||||
(a2-2 #f)
|
||||
(a3-1 44)
|
||||
(t0-1 320)
|
||||
@@ -365,7 +365,7 @@
|
||||
)
|
||||
)
|
||||
(set! sv-128 print-game-text)
|
||||
(let ((a0-26 (lookup-text! *common-text* (text-id text-x176) #f))
|
||||
(let ((a0-26 (lookup-text! *common-text* (text-id race-you-lose) #f))
|
||||
(a1-5 s1-0)
|
||||
(a2-4 #f)
|
||||
(a3-2 44)
|
||||
@@ -416,7 +416,7 @@
|
||||
(s0-1 (clear (-> obj strings s3-0 text)))
|
||||
)
|
||||
(set! sv-160 "~S~D")
|
||||
(let ((a2-10 (lookup-text! *common-text* (text-id text-x178) #f))
|
||||
(let ((a2-10 (lookup-text! *common-text* (text-id race-lap) #f))
|
||||
(a3-4 (+ s4-0 1))
|
||||
)
|
||||
(s1-3 s0-1 sv-160 a2-10 a3-4)
|
||||
|
||||
+3
-3
@@ -1317,7 +1317,7 @@
|
||||
(set! (-> gp-1 origin y) 320.0)
|
||||
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
|
||||
(let ((s5-0 print-game-text))
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id race-unknown) #f) 1)
|
||||
(format (clear *temp-string*) (lookup-text! *common-text* (text-id progress-x-to-continue) #f) 1)
|
||||
(s5-0 *temp-string* gp-1 #f 44 (bucket-id progress))
|
||||
)
|
||||
)
|
||||
@@ -1355,12 +1355,12 @@
|
||||
(set! (-> gp-1 origin y) 320.0)
|
||||
(set! (-> gp-1 flags) (font-flags shadow kerning middle left large))
|
||||
(let ((s5-0 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-0 *temp-string* gp-1 #f 44 (bucket-id progress))
|
||||
)
|
||||
(set! (-> gp-1 origin y) (+ 35.0 (-> gp-1 origin y)))
|
||||
(let ((s5-1 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-1 *temp-string* gp-1 #f 44 (bucket-id progress))
|
||||
)
|
||||
)
|
||||
|
||||
+2
-5
@@ -546,7 +546,6 @@ This commonly includes things such as:
|
||||
)
|
||||
|
||||
;; definition for method 3 of type keira-npc
|
||||
;; INFO: this function exists in multiple non-identical object files
|
||||
(defmethod inspect keira-npc ((obj keira-npc))
|
||||
(when (not obj)
|
||||
(set! obj obj)
|
||||
@@ -560,7 +559,6 @@ This commonly includes things such as:
|
||||
)
|
||||
|
||||
;; definition for method 35 of type keira-npc
|
||||
;; INFO: this function exists in multiple non-identical object files
|
||||
(defmethod get-art-elem keira-npc ((obj keira-npc))
|
||||
"Checks various things such the current actor, task status, etc to determine the right art-group data to use
|
||||
@returns the appropriate [[art-element]] for the given NPC"
|
||||
@@ -575,7 +573,6 @@ This commonly includes things such as:
|
||||
)
|
||||
|
||||
;; definition for method 33 of type keira-npc
|
||||
;; INFO: this function exists in multiple non-identical object files
|
||||
;; WARN: Return type mismatch int vs none.
|
||||
(defmethod init-art! keira-npc ((obj keira-npc))
|
||||
"@see [[initialize-skeleton]]"
|
||||
@@ -997,10 +994,10 @@ This commonly includes things such as:
|
||||
(let ((v1-1 (get-current-task-event (-> obj task))))
|
||||
(case (-> v1-1 action)
|
||||
(((game-task-action play))
|
||||
(set! (-> obj talk-message) (text-id text-x186))
|
||||
(set! (-> obj talk-message) (text-id press-triangle-to-play))
|
||||
)
|
||||
(else
|
||||
(set! (-> obj talk-message) (text-id text-x181))
|
||||
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
|
||||
)
|
||||
)
|
||||
(if (and (= (-> v1-1 action) (game-task-action play))
|
||||
|
||||
+7
-1
@@ -624,7 +624,13 @@
|
||||
(set! (-> v1-53 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)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
+2
-2
@@ -143,10 +143,10 @@ This commonly includes things such as:
|
||||
@returns the appropriate [[art-element]] for the given NPC"
|
||||
(case (-> (get-current-task-event (-> obj task)) action)
|
||||
(((game-task-action play))
|
||||
(set! (-> obj talk-message) (text-id text-x186))
|
||||
(set! (-> obj talk-message) (text-id press-triangle-to-play))
|
||||
)
|
||||
(else
|
||||
(set! (-> obj talk-message) (text-id text-x181))
|
||||
(set! (-> obj talk-message) (text-id press-triangle-to-talk))
|
||||
)
|
||||
)
|
||||
(-> obj draw art-group data 2)
|
||||
|
||||
Reference in New Issue
Block a user