From 42780e8f8c2abbb1574bb8c3774bb1660b2e6f19 Mon Sep 17 00:00:00 2001
From: ManDude <7569514+ManDude@users.noreply.github.com>
Date: Fri, 27 Jan 2023 22:50:54 +0000
Subject: [PATCH] Fix a few errors in the entity debugger (#2166)

---
 goal_src/jak1/engine/entity/entity.gc  | 12 +++++++-----
 goal_src/jak1/engine/game/main.gc      |  2 +-
 goal_src/jak1/engine/sound/gsound-h.gc |  5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/goal_src/jak1/engine/entity/entity.gc b/goal_src/jak1/engine/entity/entity.gc
index 98b2f93d38..8392e3507f 100644
--- a/goal_src/jak1/engine/entity/entity.gc
+++ b/goal_src/jak1/engine/entity/entity.gc
@@ -1941,26 +1941,28 @@
       (cond
         ;; some water-height info
         ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float))
-          (format *debug-temp-string* " ~mm ~mm ~mm #x~X"
+          (+! y-adv (* 8 1))
+          (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)"
                 (-> (the (pointer float) data) 0)
                 (-> (the (pointer float) data) 1)
                 (-> (the (pointer float) data) 2)
-                (-> (the (pointer uint32) data) 3)
+                (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*)
                 )
           )
         ;; some water-height info but with 5 elts
         ((and (= (-> e tag i name) 'water-height) (= (-> e tag i elt-count) 4) (= (-> e tag i elt-type) float))
-          (format *debug-temp-string* " ~mm ~mm ~mm #x~X ~mm"
+          (+! y-adv (* 8 2))
+          (format *debug-temp-string* " ~mm ~mm ~mm~%(~S)~%~mm"
                 (-> (the (pointer float) data) 0)
                 (-> (the (pointer float) data) 1)
                 (-> (the (pointer float) data) 2)
-                (-> (the (pointer uint32) data) 3)
+                (begin (bit-enum->string water-flags (the int (-> (the (pointer float) data) 3)) (clear *temp-string*)) *temp-string*)
                 (-> (the (pointer float) data) 4)
                 )
           )
         ;; music flava (music ambients)
         ((and (= (-> e tag i name) 'flava) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32))
-          (format *debug-temp-string* " (music-flava ~S)" (enum->string music-flava (-> (the (pointer int32) data) 0)))
+          (format *debug-temp-string* " (music-flava ~S)" (music-flava->string (-> (the (pointer music-flava) data) 0)))
           )
         ;; text id (can be hint ambient)
         ((and (= (-> e tag i name) 'text-id) (= (-> e tag i elt-count) 1) (= (-> e tag i elt-type) int32))
diff --git a/goal_src/jak1/engine/game/main.gc b/goal_src/jak1/engine/game/main.gc
index c136e69644..a56716e030 100644
--- a/goal_src/jak1/engine/game/main.gc
+++ b/goal_src/jak1/engine/game/main.gc
@@ -820,7 +820,7 @@
                 (dotimes (i LEVEL_COUNT)
                   (format *stdcon* "level ~D ~12A ~A~%" i (-> *level* level i name) (-> *level* level i display?))
                   )
-                (format *stdcon* "music ~A (f: ~D/~S)~%" (-> *setting-control* current music) (-> *setting-control* current sound-flava) (enum->string music-flava (-> *setting-control* default sound-flava)))
+                (format *stdcon* "music ~A (f: ~D/~S)~%" (-> *setting-control* current music) (-> *setting-control* current sound-flava) (music-flava->string (the-as music-flava (-> *setting-control* default sound-flava))))
                 (format *stdcon* "sound ~A ~A~%" *sound-bank-1* *sound-bank-2*)
                 (let ((pos (target-pos 0)))
                     (format *stdcon* "target ~m ~m ~m~%" (-> pos x) (-> pos y) (-> pos z))
diff --git a/goal_src/jak1/engine/sound/gsound-h.gc b/goal_src/jak1/engine/sound/gsound-h.gc
index 5ca159662e..e08d7fa717 100644
--- a/goal_src/jak1/engine/sound/gsound-h.gc
+++ b/goal_src/jak1/engine/sound/gsound-h.gc
@@ -551,6 +551,11 @@
 (define *sound-bank-1* #f)
 (define *sound-bank-2* #f)
 
+;; added for PC port
+(defun-debug music-flava->string ((f music-flava))
+  "print the name of a music-flava"
+  (enum->string music-flava f))
+
 (defun-extern string->sound-name string sound-name)
 (defun-extern sound-set-ear-trans vector vector float int)
 (defun-extern ear-trans vector)