issues over creating a new font-context

open-goal · Jun 2, 2021 · 4a7ee7d · 4a7ee7d
1 parent 5acec70
commit 4a7ee7d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 88 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -52,7 +52,7 @@ tasks:
       - ./out/build/Release/bin/offline-test.exe "./iso_data/jak1"
   update-reference-tests:
     cmds:
-      - ./out/build/Debug/bin/offline-test.exe "./iso_data/jak1" --dump-mode
+      - ./out/build/Release/bin/offline-test.exe "./iso_data/jak1" --dump-mode
       - python .\scripts\update_decomp_reference.py .\failures\ .\test\decompiler\reference\
       - task: offline-tests
 
diff --git a/goal_src/engine/ui/credits.gc b/goal_src/engine/ui/credits.gc
@@ -15,58 +15,19 @@
     (if (< 128.0 f0-2)
      (set! f0-2 128.0)
      )
-    (let
-     ((a1-6
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -256)
-         )
-        (the-as uint (shr (shl (the int f0-2) 56) 56))
-        )
-       )
-      (a2-6 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-6 2496) a1-6)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 r) (the int f0-2))
     )
    (let ((f0-5 (* 64.0 arg0)))
     (if (< 128.0 f0-5)
      (set! f0-5 128.0)
      )
-    (let
-     ((a1-13
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -65281)
-         )
-        (the-as uint (shr (shl (the int f0-5) 56) 48))
-        )
-       )
-      (a2-13 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-13 2496) a1-13)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 g) (the int f0-5))
     )
    (let ((f0-8 (* 64.0 arg0)))
     (if (< 128.0 f0-8)
      (set! f0-8 128.0)
      )
-    (let
-     ((a1-20
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -16711681)
-         )
-        (the-as uint (shr (shl (the int f0-8) 56) 40))
-        )
-       )
-      (a2-20 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-20 2496) a1-20)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 b) (the int f0-8))
     )
    )
   )
@@ -242,3 +203,7 @@
     )
    )
   )
+
+
+
+
diff --git a/test/decompiler/reference/engine/ui/credits_REF.gc b/test/decompiler/reference/engine/ui/credits_REF.gc
@@ -11,58 +11,19 @@
     (if (< 128.0 f0-2)
      (set! f0-2 128.0)
      )
-    (let
-     ((a1-6
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -256)
-         )
-        (the-as uint (shr (shl (the int f0-2) 56) 56))
-        )
-       )
-      (a2-6 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-6 2496) a1-6)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 r) (the int f0-2))
     )
    (let ((f0-5 (* 64.0 arg0)))
     (if (< 128.0 f0-5)
      (set! f0-5 128.0)
      )
-    (let
-     ((a1-13
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -65281)
-         )
-        (the-as uint (shr (shl (the int f0-5) 56) 48))
-        )
-       )
-      (a2-13 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-13 2496) a1-13)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 g) (the int f0-5))
     )
    (let ((f0-8 (* 64.0 arg0)))
     (if (< 128.0 f0-8)
      (set! f0-8 128.0)
      )
-    (let
-     ((a1-20
-       (logior
-        (logand
-         (l.wu (+ (+ (* v1-0 4) (the-as int *font-work*)) 2496))
-         (the-as uint -16711681)
-         )
-        (the-as uint (shr (shl (the int f0-8) 56) 40))
-        )
-       )
-      (a2-20 (+ (* v1-0 4) (the-as int *font-work*)))
-      )
-     (s.w! (+ a2-20 2496) a1-20)
-     )
+    (set! (-> *font-work* color-table 32 color v1-0 b) (the int f0-8))
     )
    )
   (let ((v0-0 0))

diff --git a/test/decompiler/reference/engine/ui/text-h_REF.gc b/test/decompiler/reference/engine/ui/text-h_REF.gc
@@ -31,7 +31,7 @@
   :size-assert         #x10
   :flag-assert         #xa00000010
   (:methods
-    (dummy-9 () none 9)
+    (dummy-9 (_type_ uint symbol) string 9)
     )
   )
 
@@ -54,8 +54,8 @@
 ;; definition for symbol *common-text-heap*, type kheap
 (define *common-text-heap* (new 'global 'kheap))
 
-;; definition for symbol *common-text*, type symbol
-(define *common-text* #f)
+;; definition for symbol *common-text*, type game-text-info
+(define *common-text* (the-as game-text-info #f))
 
 ;; failed to figure out what this is:
 (let ((v0-3 0))