decomp: finalized credits

decompiler/config/jak1_ntsc_black_label/stack_vars.jsonc

@@ -256,10 +256,10 @@
   ],
 
   "draw-end-credits": [
-    [16, "symbol"]
+    [16, "font-context"]
   ],
 
   "draw-title-credits": [
-    [16, "symbol"]
+    [16, "font-context"]
   ]
 }

goal_src/engine/game/game-save.gc

@@ -5,3 +5,5 @@
 ;; name in dgo: game-save
 ;; dgos: GAME, ENGINE
 
+;; TODO - for credits
+(define-extern print-game-text (function string font-context symbol int int float)) ; TODO decomp error, this seems correct though

goal_src/engine/game/main.gc

@@ -9,3 +9,6 @@
   "Are we in a movie?"
   (nonzero? (logand (-> *kernel-context* prevent-from-run) (process-mask movie)))
   )
+
+;; TODO - for credits
+(define-extern scf-get-territory (function int))

goal_src/engine/ui/credits.gc

@@ -30,6 +30,7 @@
     (set! (-> *font-work* color-table 32 color v1-0 b) (the int f0-8))
     )
    )
+  (none)
   )
 
 ;; definition for symbol *title-credits-scale*, type (array float)
@@ -56,9 +57,9 @@
           (f30-0 (* arg0 (the float (+ s4-0 -2))))
           (s5-0 (the int f30-0))
           (gp-0
-           ((method-of-type font-context new)
-            (new 'stack-no-clear 'symbol)
-            font-context
+           (new
+            'stack
+            'font-context
             *font-default-matrix*
             0
             0
@@ -135,6 +136,7 @@
      )
     )
    )
+  (none)
   )
 
 ;; definition for function draw-end-credits
@@ -148,16 +150,7 @@
     (s3-0 0)
     (s2-0 #t)
     (s5-0
-     ((method-of-type font-context new)
-      (new 'stack-no-clear 'symbol)
-      font-context
-      *font-default-matrix*
-      31
-      0
-      0.0
-      0
-      (the-as uint 3)
-      )
+     (new 'stack 'font-context *font-default-matrix* 31 0 0.0 0 (the-as uint 3))
      )
     )
    (let ((v1-2 s5-0))

goal_src/engine/ui/text-h.gc

@@ -22,22 +22,23 @@
 
 ;; A table of all strings.
 (deftype game-text-info (basic)
-  ((length      int32            :offset-assert 4)
-   (language-id int32            :offset-assert 8)
-   (group-name  string           :offset-assert 12)
-   (data        game-text :dynamic :inline :offset-assert 16)
+  ((length      int32                      :offset-assert 4)
+   (language-id int32                      :offset-assert 8)
+   (group-name  string                     :offset-assert 12)
+   (data        game-text :inline :dynamic :offset-assert 16)
    )
   :method-count-assert 10
   :size-assert         #x10
   :flag-assert         #xa00000010
   (:methods
-    (dummy-9 () none 9)
+    (dummy-9 (_type_ uint symbol) string 9)
     )
   )
 
 ;; todo, need support for array
 (define *text-group-names* (new 'static 'boxed-array string 1 "common"))
 
 (define *common-text-heap* (new 'global 'kheap))
-;; probably some other type.
-(define *common-text* #f)
+
+;; definition for symbol *common-text*, type game-text-info
+(define *common-text* (the-as game-text-info #f))

test/decompiler/reference/all_forward_declarations.gc

@@ -718,3 +718,8 @@
      vec
      )
   )
+
+;; TODO - for credits
+(define-extern scf-get-territory (function int))
+(declare-type font-context basic)
+(define-extern print-game-text (function string font-context symbol int int float)) ; TODO decomp error, this seems correct though

test/decompiler/reference/engine/ui/credits_REF.gc

@@ -55,9 +55,9 @@
           (f30-0 (* arg0 (the float (+ s4-0 -2))))
           (s5-0 (the int f30-0))
           (gp-0
-           ((method-of-type font-context new)
-            (new 'stack-no-clear 'symbol)
-            font-context
+           (new
+            'stack
+            'font-context
             *font-default-matrix*
             0
             0
@@ -150,16 +150,7 @@
     (s3-0 0)
     (s2-0 #t)
     (s5-0
-     ((method-of-type font-context new)
-      (new 'stack-no-clear 'symbol)
-      font-context
-      *font-default-matrix*
-      31
-      0
-      0.0
-      0
-      (the-as uint 3)
-      )
+     (new 'stack 'font-context *font-default-matrix* 31 0 0.0 0 (the-as uint 3))
      )
     )
    (let ((v1-2 s5-0))