don't use gender for citizen names + small minor stuff (#2708)

It's ultimately not useful information and kind of clutters the text.

game/assets/jak2/subtitle/subtitle_en-US.json

@@ -1,6 +1,19 @@
 {
   "lang": 0,
   "scenes": {
+    "DSbop001": {
+      "lines": [
+        {
+          "end": 36.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "You sure seem angry, Jak."
+        }
+      ],
+      "scene": false
+    },
     "DSbop002": {
       "lines": [
         {
@@ -56,6 +69,103 @@
       ],
       "scene": false
     },
+    "DSbop005": {
+      "lines": [
+        {
+          "end": 56.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Good job, see? You still got it!"
+        }
+      ],
+      "scene": false
+    },
+    "DSbop006": {
+      "lines": [
+        {
+          "end": 69.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "I never found hide nor hair of Keira or Samos."
+        },
+        {
+          "end": 101.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 70.0,
+          "text": "I don't know where they went."
+        }
+      ],
+      "scene": false
+    },
+    "DSbop007": {
+      "lines": [
+        {
+          "end": 74.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "I don't know where that crazy rift vehicle took us, but..."
+        },
+        {
+          "end": 119.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 75.0,
+          "text": "It's some kind of big city!"
+        }
+      ],
+      "scene": false
+    },
+    "DSbop008": {
+      "lines": [
+        {
+          "end": 70.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "It's a tough place, Jak. You DO remember"
+        },
+        {
+          "end": 162.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 71.0,
+          "text": "how to fight, right? Try breaking that crate with a kick."
+        }
+      ],
+      "scene": false
+    },
+    "DSbop009": {
+      "lines": [
+        {
+          "end": 88.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Looking good, partner! Nice spin kick!"
+        },
+        {
+          "end": 136.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 89.0,
+          "text": "Works out some of that anger, eh?"
+        }
+      ],
+      "scene": false
+    },
     "DSbop010": {
       "lines": [
         {
@@ -11300,6 +11410,136 @@
       ],
       "scene": true
     },
+    "daxm001": {
+      "lines": [
+        {
+          "end": 35.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Shoot the platform, Jak."
+        }
+      ],
+      "scene": false
+    },
+    "daxm002": {
+      "lines": [
+        {
+          "end": 52.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "We need something to get through that gate!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm003": {
+      "lines": [
+        {
+          "end": 48.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Shoot the Metal Head when he moves his shield!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm004": {
+      "lines": [
+        {
+          "end": 26.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Hit him in his stomach!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm005": {
+      "lines": [
+        {
+          "end": 98.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Whoa! That path dropped lke uh... a rock!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm006": {
+      "lines": [
+        {
+          "end": 34.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Smack the box, baby!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm007": {
+      "lines": [
+        {
+          "end": 52.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "That's what I call a rocky road!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm008": {
+      "lines": [
+        {
+          "end": 32.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "We gotta get to the top!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm009": {
+      "lines": [
+        {
+          "end": 24.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "We made it!!"
+        }
+      ],
+      "scene": false
+    },
+    "daxm010": {
+      "lines": [
+        {
+          "end": 23.0,
+          "merge": false,
+          "offscreen": true,
+          "speaker": "daxter",
+          "start": 0.0,
+          "text": "Rock 'n roll!"
+        }
+      ],
+      "scene": false
+    },
     "dig-find-totem-intro": {
       "lines": [
         {
@@ -25519,8 +25759,8 @@
     "ashelin": "Ashelin",
     "baron": "Baron Praxis",
     "brutter": "Brutter",
-    "citizen-female": "Female Citizen",
+    "citizen-female": "Citizen",
-    "citizen-male": "Male Citizen",
+    "citizen-male": "Citizen",
     "computer": "Computer",
     "darkjak": "Dark Jak",
     "daxter": "Daxter",

game/assets/jak2/subtitle/subtitle_jp-JP.json

@@ -36,8 +36,8 @@
     "ashelin": "アシュリン",
     "baron": "バロンプラクシス",
     "brutter": "ブラッター",
-    "citizen-female": "女性しみん",
+    "citizen-female": "しみん",
-    "citizen-male": "だん性しみん",
+    "citizen-male": "しみん",
     "computer": "コンピュータ",
     "darkjak": "ダークジャック",
     "daxter": "ダックスター",

goal_src/jak2/game.gp

@@ -391,5 +391,7 @@
        "$OUT/iso/0SUBTI2.TXT"
        "$OUT/iso/KERNEL.CGO"
        "$OUT/iso/GAME.CGO"
+       "$OUT/iso/VAGDIR.AYB"
+       "$OUT/iso/VAGWAD.ENG"
        )
 

goal_src/jak2/levels/common/battle.gc

@@ -840,6 +840,11 @@
     )
   (dotimes (s5-1 (-> obj spawners length))
     (let ((s4-1 (-> obj spawners data s5-1)))
+      (#when PC_PORT
+        ;; added. a battle may have enemies from an unloaded level in its ally list (e.g. atoll battle has atollext enemies).
+        (if (not (valid? (-> s4-1 entity) entity-actor "battle spawners" #f *stdcon*))
+            (deactivate obj))
+        )
       (let ((a0-6 (-> s4-1 intro-path)))
         (if a0-6
             (debug-draw a0-6)

goal_src/jak2/levels/intro/intro-obs.gc

@@ -240,7 +240,8 @@ This commonly includes things such as:
     (the-as skeleton-group (art-group-get-by-name *level* "skel-intro-flamer" (the-as (pointer uint32) #f)))
     (the-as pair 0)
     )
-  (set! (-> self draw force-lod) 2)
+  (#unless PC_PORT
+    (set! (-> self draw force-lod) 2))
   (set! (-> self id) arg0)
   (set! (-> self path-u) 0.0)
   (set! (-> self path-du) (rand-vu-float-range 0.15 0.32))