decomp3: more misc files (#3513)

4 missions to go! - `ctygenb-part` - `power-game` - `vinroom-part` - `vinroom-scenes` - `gungame-part` - `gungame-scenes` - `hiphog-obs` - `hiphog-part` - `hiphog-scenes` - `hover-nav-lpattack` - `king-rider` - `rubble-attack` - `rubble-obs` - `rubble-part` - `rubblea-init` - `rublcst-scenes` - `mood-funcs2` - `gun-dummy-art` - `gun-dummy-part` - `gun-dummy` - `gungame-data` - `gungame-manager` - `gungame-obs` - `blow-tower-data` - `blow-tower-extra` - `blow-tower-obs2` - `blow-tower-obs` - `blow-tower-part` - `blow-tower-script` - `blow-tower-shared` - `blow-tower-speech` - `cty-blow-tower`
open-goal · May 11, 2024 · 6b3844b · 6b3844b
1 parent 24490c0
commit 6b3844b
Show file tree

Hide file tree

Showing 91 changed files with 118,171 additions and 1,007 deletions.
diff --git a/decompiler/config/jak3/all-types.gc b/decompiler/config/jak3/all-types.gc
diff --git a/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc b/decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc
@@ -939,5 +939,44 @@
     [38, "(function none :behavior scene-player)"],
     [39, "(function none :behavior scene-player)"]
   ],
-  "freehq-scenes": [[0, "(function none :behavior scene-player)"]]
+  "freehq-scenes": [[0, "(function none :behavior scene-player)"]],
+  "hiphog-scenes": [
+    [0, "(function none :behavior scene-player)"],
+    [1, "(function none :behavior scene-player)"],
+    [2, "(function none :behavior scene-player)"],
+    [3, "(function none :behavior scene-player)"]
+  ],
+  "rubble-attack": [[7, "(function int)"]],
+  "rublcst-scenes": [
+    [0, "(function none :behavior scene-player)"],
+    [1, "(function none :behavior scene-player)"],
+    [2, "(function none :behavior scene-player)"],
+    [3, "(function none :behavior scene-player)"],
+    [4, "(function none :behavior scene-player)"],
+    [5, "(function none :behavior scene-player)"],
+    [6, "(function none :behavior scene-player)"],
+    [7, "(function none :behavior scene-player)"],
+    [8, "(function none :behavior scene-player)"],
+    [9, "(function none :behavior scene-player)"],
+    [10, "(function none :behavior scene-player)"],
+    [11, "(function none :behavior scene-player)"],
+    [12, "(function none :behavior scene-player)"],
+    [13, "(function none :behavior scene-player)"]
+  ],
+  "vinroom-scenes": [
+    [0, "(function none :behavior scene-player)"],
+    [1, "(function none :behavior scene-player)"]
+  ],
+  "gungame-manager": [[6, "(function process symbol)"]],
+  "blow-tower-obs2": [
+    [16, "(function bt-mh-flyer cspace float float vector vector int none)"],
+    [117, "(function bt-roboguard symbol quaternion)"],
+    [124, "(function cspace transformq none)"]
+  ],
+  "cty-blow-tower": [
+    [39, "(function collide-shape-prim none)"],
+    [27, "(function process symbol)"],
+    [46, "(function collide-shape-prim none)"],
+    [69, "(function process object)"]
+  ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/art_info.jsonc b/decompiler/config/jak3/ntsc_v1/art_info.jsonc
@@ -27,7 +27,15 @@
     "factory-boss": "errol-lowres-ag",
     "fac-robotank-turret": "fac-robotank-ag",
     "neo-sat-shield": "neo-satellite-shield-ag",
-    "neo-sat": "neo-satellite-ag"
+    "neo-sat": "neo-satellite-ag",
+    "power-game-switcher": "switcher-ag",
+    "power-game-player": "daxter-pac-man-ag",
+    "power-game-glyph": "cipher-ag",
+    "power-game-rings": "pow-rings-ag",
+    "power-game-chaser": "flitter-ag",
+    "power-game-zapper": "grunt-head-ag",
+    "gungame-door": "fort-entry-gate-ag",
+    "bt-mh-flyer": "bt-wasp-ag"
   },
 
   // remap names for types in an entire file (higher priority)

diff --git a/decompiler/config/jak3/ntsc_v1/hacks.jsonc b/decompiler/config/jak3/ntsc_v1/hacks.jsonc
@@ -107,7 +107,6 @@
     // jak 3
     "(method 10 manipulator)",
     "(method 46 ff-squad-control)",
-    "(method 33 rub-tower)",
     "memcpy"
   ],
 
@@ -273,7 +272,8 @@
     "~10Hfg-wa: ~8,,0m": 1,
     "~140Hfg-sh: ~8,,0m": 1,
     "~267Hfg-p2: ~8,,0m~%": 1,
-    "~30Hp2: ~8D~131Hhf: ~8D~%~1K": 2
+    "~30Hp2: ~8D~131Hhf: ~8D~%~1K": 2,
+    "Current time (~d:~d) [mission-percentage ~f~%": 2
   },
 
   "blocks_ending_in_asm_branch": {
@@ -464,7 +464,9 @@
     "(method 261 crimson-guard)": [52, 64],
     "(anon-function 13 metalhead-predator)": [24, 25],
     "(anon-function 90 ctywide-obs)": [4],
-    "(anon-function 10 cty-sniper-turret)": [44]
+    "(anon-function 10 cty-sniper-turret)": [44],
+    "(method 33 rub-tower)": [9, 10],
+    "(method 30 gungame-manager)": [0, 4, 5, 7]
   },
 
   // Sometimes the game might use format strings that are fetched dynamically,
@@ -566,7 +568,20 @@
       [202, 0]
     ],
     "(method 33 task-manager-bbush-board)": [[86, 0]],
-    "(method 17 board-score-hud)": [[71, 0]]
+    "(method 17 board-score-hud)": [[71, 0]],
+    "(method 23 gungame-manager)": [
+      [52, 0],
+      [90, 0],
+      [128, 0],
+      [164, 0],
+      [194, 0],
+      [235, 0],
+      [273, 0],
+      [305, 0],
+      [346, 0],
+      [378, 0],
+      [413, 0]
+    ]
   },
 
   "mips2c_functions_by_name": [

diff --git a/decompiler/config/jak3/ntsc_v1/label_types.jsonc b/decompiler/config/jak3/ntsc_v1/label_types.jsonc
@@ -1901,7 +1901,7 @@
     ["L593", "uint64", true],
     ["L595", "uint64", true]
   ],
- "hfrag-vu1": [
+  "hfrag-vu1": [
     ["L250", "uint64", true],
     ["L249", "uint64", true],
     ["L248", "uint64", true],
@@ -1924,5 +1924,204 @@
     ["L231", "uint64", true],
     ["L230", "uint64", true],
     ["L229", "uint64", true]
+  ],
+  "hiphog-part": [
+    ["L219", "uint64", true],
+    ["L26", "(inline-array ripple-wave)", 6]
+  ],
+  "king-rider": [["L33", "attack-info"]],
+  "rubble-obs": [["L193", "(inline-array vector)", 2]],
+  "power-game": [
+    ["L971", "uint64", true],
+    ["L966", "uint64", true],
+    ["L967", "uint64", true],
+    ["L968", "uint64", true],
+    ["L972", "uint64", true],
+    ["L965", "uint64", true],
+    ["L969", "uint64", true],
+    ["L970", "uint64", true],
+    ["L783", "(inline-array power-game-cell)", 256],
+    ["L732", "(inline-array talker-speech-class)", 50],
+    ["L687", "vector"],
+    ["L841", "uint64", true],
+    ["L838", "uint64", true],
+    ["L848", "uint64", true],
+    ["L853", "uint64", true],
+    ["L846", "uint64", true],
+    ["L845", "uint64", true],
+    ["L847", "uint64", true],
+    ["L843", "uint64", true],
+    ["L837", "uint64", true],
+    ["L855", "uint64", true],
+    ["L854", "uint64", true],
+    ["L852", "uint64", true],
+    ["L730", "vector"],
+    ["L729", "vector"],
+    ["L728", "vector"],
+    ["L727", "vector"],
+    ["L836", "uint64", true],
+    ["L842", "uint64", true],
+    ["L840", "uint64", true],
+    ["L844", "uint64", true],
+    ["L849", "uint64", true],
+    ["L839", "uint64", true],
+    ["L851", "uint64", true],
+    ["L850", "uint64", true]
+  ],
+  "gun-dummy": [
+    ["L463", "uint64", true],
+    ["L460", "uint64", true],
+    ["L458", "uint64", true],
+    ["L462", "uint64", true],
+    ["L461", "uint64", true],
+    ["L457", "uint64", true],
+    ["L459", "uint64", true],
+    ["L306", "vector"],
+    ["L312", "uint64", true],
+    ["L323", "uint64", true],
+    ["L322", "uint64", true],
+    ["L316", "uint64", true],
+    ["L317", "uint64", true],
+    ["L321", "uint64", true],
+    ["L315", "uint64", true],
+    ["L314", "uint64", true],
+    ["L310", "uint64", true],
+    ["L313", "uint64", true],
+    ["L311", "uint64", true],
+    ["L319", "uint64", true],
+    ["L318", "uint64", true],
+    ["L320", "uint64", true]
+  ],
+  "gungame-obs": [
+    ["L91", "uint64", true],
+    ["L79", "uint64", true],
+    ["L76", "uint64", true],
+    ["L78", "uint64", true],
+    ["L77", "uint64", true]
+  ],
+  "gungame-data": [["L2388", "uint64", true]],
+  "gungame-manager": [
+    ["L580", "uint64", true],
+    ["L579", "uint64", true],
+    ["L583", "uint64", true],
+    ["L584", "uint64", true],
+    ["L582", "uint64", true],
+    ["L581", "uint64", true],
+    ["L396", "uint64", true]
+  ],
+  "mood-funcs2": [
+    ["L115", "uint64", true],
+    ["L116", "uint64", true],
+    ["L117", "uint64", true],
+    ["L118", "uint64", true],
+    ["L120", "uint64", true],
+    ["L119", "uint64", true],
+    ["L121", "uint64", true]
+  ],
+  "blow-tower-shared": [["L34", "(inline-array talker-speech-class)", 60]],
+  "blow-tower-obs": [
+    ["L428", "uint64", true],
+    ["L437", "uint64", true],
+    ["L436", "uint64", true],
+    ["L435", "uint64", true],
+    ["L431", "uint64", true],
+    ["L433", "uint64", true],
+    ["L429", "uint64", true],
+    ["L434", "uint64", true],
+    ["L430", "uint64", true],
+    ["L438", "uint64", true],
+    ["L432", "uint64", true],
+    ["L322", "uint64", true],
+    ["L326", "uint64", true],
+    ["L323", "uint64", true],
+    ["L321", "uint64", true],
+    ["L320", "uint64", true],
+    ["L324", "uint64", true],
+    ["L309", "attack-info"],
+    ["L325", "uint64", true],
+    ["L303", "attack-info"],
+    ["L302", "attack-info"],
+    ["L304", "attack-info"]
+  ],
+  "blow-tower-obs2": [
+    ["L681", "uint64", true],
+    ["L683", "uint64", true],
+    ["L686", "uint64", true],
+    ["L684", "uint64", true],
+    ["L680", "uint64", true],
+    ["L685", "uint64", true],
+    ["L682", "uint64", true],
+    ["L565", "uint64", true],
+    ["L563", "uint64", true],
+    ["L562", "uint64", true],
+    ["L559", "uint64", true],
+    ["L571", "uint64", true],
+    ["L560", "uint64", true],
+    ["L572", "uint64", true],
+    ["L574", "uint64", true],
+    ["L570", "uint64", true],
+    ["L577", "uint64", true],
+    ["L585", "uint64", true],
+    ["L549", "vector"],
+    ["L548", "vector"],
+    ["L547", "vector"],
+    ["L567", "uint64", true],
+    ["L587", "uint64", true],
+    ["L566", "uint64", true],
+    ["L579", "uint64", true],
+    ["L564", "uint64", true],
+    ["L581", "uint64", true],
+    ["L573", "uint64", true],
+    ["L569", "uint64", true],
+    ["L580", "uint64", true],
+    ["L576", "uint64", true],
+    ["L521", "attack-info"],
+    ["L586", "uint64", true],
+    ["L578", "uint64", true],
+    ["L575", "uint64", true],
+    ["L582", "uint64", true],
+    ["L583", "uint64", true],
+    ["L558", "uint64", true],
+    ["L584", "uint64", true],
+    ["L561", "uint64", true],
+    ["L533", "attack-info"],
+    ["L568", "uint64", true]
+  ],
+  "cty-blow-tower": [
+    ["L1038", "bombbot-path"],
+    ["L1283", "uint64", true],
+    ["L1288", "uint64", true],
+    ["L1281", "uint64", true],
+    ["L1278", "uint64", true],
+    ["L1282", "uint64", true],
+    ["L1285", "uint64", true],
+    ["L1287", "uint64", true],
+    ["L1279", "uint64", true],
+    ["L1286", "uint64", true],
+    ["L1284", "uint64", true],
+    ["L1280", "uint64", true],
+    ["L1277", "uint64", true],
+    ["L1051", "uint64", true],
+    ["L1054", "uint64", true],
+    ["L998", "(inline-array kg-squad-member-settings)", 4],
+    ["L1053", "uint64", true],
+    ["L1034", "(pointer float)", 4],
+    ["L1043", "uint64", true],
+    ["L1046", "uint64", true],
+    ["L1048", "uint64", true],
+    ["L1057", "uint64", true],
+    ["L1045", "uint64", true],
+    ["L1052", "uint64", true],
+    ["L1042", "uint64", true],
+    ["L1055", "uint64", true],
+    ["L1050", "uint64", true],
+    ["L1058", "uint64", true],
+    ["L1041", "uint64", true],
+    ["L1059", "uint64", true],
+    ["L1049", "uint64", true],
+    ["L1010", "attack-info"],
+    ["L1047", "uint64", true],
+    ["L1056", "uint64", true],
+    ["L1044", "uint64", true]
   ]
 }
diff --git a/decompiler/config/jak3/ntsc_v1/process_stack_size_overrides.jsonc b/decompiler/config/jak3/ntsc_v1/process_stack_size_overrides.jsonc
@@ -6,5 +6,6 @@
   "scene-player-init": 1024,
   "task-manager-init-by-other": 2048,
   "race-manager-init-by-other": 1024,
-  "neo-sat-shield-init-by-other": 64
+  "neo-sat-shield-init-by-other": 64,
+  "bt-gun-manager-init-by-other": 256
 }