Skip to content

Commit 7d28ab8

Browse files
Zedb0TBreakPointsHat-Kid
authored
Main with update (#81)
* Intro palace DGOs (#3512) Now needed to extract and compile from scratch * 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` --------- Co-authored-by: BreakPoints <JackHooley7@gmail.com> Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
1 parent 96f2144 commit 7d28ab8

File tree

91 files changed

+118171
-1007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+118171
-1007
lines changed

‎decompiler/config/jak3/all-types.gc

+821-965
Large diffs are not rendered by default.

‎decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc

+40-1
Original file line numberDiff line numberDiff line change
@@ -939,5 +939,44 @@
939939
[38, "(function none :behavior scene-player)"],
940940
[39, "(function none :behavior scene-player)"]
941941
],
942-
"freehq-scenes": [[0, "(function none :behavior scene-player)"]]
942+
"freehq-scenes": [[0, "(function none :behavior scene-player)"]],
943+
"hiphog-scenes": [
944+
[0, "(function none :behavior scene-player)"],
945+
[1, "(function none :behavior scene-player)"],
946+
[2, "(function none :behavior scene-player)"],
947+
[3, "(function none :behavior scene-player)"]
948+
],
949+
"rubble-attack": [[7, "(function int)"]],
950+
"rublcst-scenes": [
951+
[0, "(function none :behavior scene-player)"],
952+
[1, "(function none :behavior scene-player)"],
953+
[2, "(function none :behavior scene-player)"],
954+
[3, "(function none :behavior scene-player)"],
955+
[4, "(function none :behavior scene-player)"],
956+
[5, "(function none :behavior scene-player)"],
957+
[6, "(function none :behavior scene-player)"],
958+
[7, "(function none :behavior scene-player)"],
959+
[8, "(function none :behavior scene-player)"],
960+
[9, "(function none :behavior scene-player)"],
961+
[10, "(function none :behavior scene-player)"],
962+
[11, "(function none :behavior scene-player)"],
963+
[12, "(function none :behavior scene-player)"],
964+
[13, "(function none :behavior scene-player)"]
965+
],
966+
"vinroom-scenes": [
967+
[0, "(function none :behavior scene-player)"],
968+
[1, "(function none :behavior scene-player)"]
969+
],
970+
"gungame-manager": [[6, "(function process symbol)"]],
971+
"blow-tower-obs2": [
972+
[16, "(function bt-mh-flyer cspace float float vector vector int none)"],
973+
[117, "(function bt-roboguard symbol quaternion)"],
974+
[124, "(function cspace transformq none)"]
975+
],
976+
"cty-blow-tower": [
977+
[39, "(function collide-shape-prim none)"],
978+
[27, "(function process symbol)"],
979+
[46, "(function collide-shape-prim none)"],
980+
[69, "(function process object)"]
981+
]
943982
}

‎decompiler/config/jak3/ntsc_v1/art_info.jsonc

+9-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,15 @@
2727
"factory-boss": "errol-lowres-ag",
2828
"fac-robotank-turret": "fac-robotank-ag",
2929
"neo-sat-shield": "neo-satellite-shield-ag",
30-
"neo-sat": "neo-satellite-ag"
30+
"neo-sat": "neo-satellite-ag",
31+
"power-game-switcher": "switcher-ag",
32+
"power-game-player": "daxter-pac-man-ag",
33+
"power-game-glyph": "cipher-ag",
34+
"power-game-rings": "pow-rings-ag",
35+
"power-game-chaser": "flitter-ag",
36+
"power-game-zapper": "grunt-head-ag",
37+
"gungame-door": "fort-entry-gate-ag",
38+
"bt-mh-flyer": "bt-wasp-ag"
3139
},
3240

3341
// remap names for types in an entire file (higher priority)

‎decompiler/config/jak3/ntsc_v1/hacks.jsonc

+19-4
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
// jak 3
108108
"(method 10 manipulator)",
109109
"(method 46 ff-squad-control)",
110-
"(method 33 rub-tower)",
111110
"memcpy"
112111
],
113112

@@ -273,7 +272,8 @@
273272
"~10Hfg-wa: ~8,,0m": 1,
274273
"~140Hfg-sh: ~8,,0m": 1,
275274
"~267Hfg-p2: ~8,,0m~%": 1,
276-
"~30Hp2: ~8D~131Hhf: ~8D~%~1K": 2
275+
"~30Hp2: ~8D~131Hhf: ~8D~%~1K": 2,
276+
"Current time (~d:~d) [mission-percentage ~f~%": 2
277277
},
278278

279279
"blocks_ending_in_asm_branch": {
@@ -464,7 +464,9 @@
464464
"(method 261 crimson-guard)": [52, 64],
465465
"(anon-function 13 metalhead-predator)": [24, 25],
466466
"(anon-function 90 ctywide-obs)": [4],
467-
"(anon-function 10 cty-sniper-turret)": [44]
467+
"(anon-function 10 cty-sniper-turret)": [44],
468+
"(method 33 rub-tower)": [9, 10],
469+
"(method 30 gungame-manager)": [0, 4, 5, 7]
468470
},
469471

470472
// Sometimes the game might use format strings that are fetched dynamically,
@@ -566,7 +568,20 @@
566568
[202, 0]
567569
],
568570
"(method 33 task-manager-bbush-board)": [[86, 0]],
569-
"(method 17 board-score-hud)": [[71, 0]]
571+
"(method 17 board-score-hud)": [[71, 0]],
572+
"(method 23 gungame-manager)": [
573+
[52, 0],
574+
[90, 0],
575+
[128, 0],
576+
[164, 0],
577+
[194, 0],
578+
[235, 0],
579+
[273, 0],
580+
[305, 0],
581+
[346, 0],
582+
[378, 0],
583+
[413, 0]
584+
]
570585
},
571586

572587
"mips2c_functions_by_name": [

‎decompiler/config/jak3/ntsc_v1/label_types.jsonc

+200-1
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@
19011901
["L593", "uint64", true],
19021902
["L595", "uint64", true]
19031903
],
1904-
"hfrag-vu1": [
1904+
"hfrag-vu1": [
19051905
["L250", "uint64", true],
19061906
["L249", "uint64", true],
19071907
["L248", "uint64", true],
@@ -1924,5 +1924,204 @@
19241924
["L231", "uint64", true],
19251925
["L230", "uint64", true],
19261926
["L229", "uint64", true]
1927+
],
1928+
"hiphog-part": [
1929+
["L219", "uint64", true],
1930+
["L26", "(inline-array ripple-wave)", 6]
1931+
],
1932+
"king-rider": [["L33", "attack-info"]],
1933+
"rubble-obs": [["L193", "(inline-array vector)", 2]],
1934+
"power-game": [
1935+
["L971", "uint64", true],
1936+
["L966", "uint64", true],
1937+
["L967", "uint64", true],
1938+
["L968", "uint64", true],
1939+
["L972", "uint64", true],
1940+
["L965", "uint64", true],
1941+
["L969", "uint64", true],
1942+
["L970", "uint64", true],
1943+
["L783", "(inline-array power-game-cell)", 256],
1944+
["L732", "(inline-array talker-speech-class)", 50],
1945+
["L687", "vector"],
1946+
["L841", "uint64", true],
1947+
["L838", "uint64", true],
1948+
["L848", "uint64", true],
1949+
["L853", "uint64", true],
1950+
["L846", "uint64", true],
1951+
["L845", "uint64", true],
1952+
["L847", "uint64", true],
1953+
["L843", "uint64", true],
1954+
["L837", "uint64", true],
1955+
["L855", "uint64", true],
1956+
["L854", "uint64", true],
1957+
["L852", "uint64", true],
1958+
["L730", "vector"],
1959+
["L729", "vector"],
1960+
["L728", "vector"],
1961+
["L727", "vector"],
1962+
["L836", "uint64", true],
1963+
["L842", "uint64", true],
1964+
["L840", "uint64", true],
1965+
["L844", "uint64", true],
1966+
["L849", "uint64", true],
1967+
["L839", "uint64", true],
1968+
["L851", "uint64", true],
1969+
["L850", "uint64", true]
1970+
],
1971+
"gun-dummy": [
1972+
["L463", "uint64", true],
1973+
["L460", "uint64", true],
1974+
["L458", "uint64", true],
1975+
["L462", "uint64", true],
1976+
["L461", "uint64", true],
1977+
["L457", "uint64", true],
1978+
["L459", "uint64", true],
1979+
["L306", "vector"],
1980+
["L312", "uint64", true],
1981+
["L323", "uint64", true],
1982+
["L322", "uint64", true],
1983+
["L316", "uint64", true],
1984+
["L317", "uint64", true],
1985+
["L321", "uint64", true],
1986+
["L315", "uint64", true],
1987+
["L314", "uint64", true],
1988+
["L310", "uint64", true],
1989+
["L313", "uint64", true],
1990+
["L311", "uint64", true],
1991+
["L319", "uint64", true],
1992+
["L318", "uint64", true],
1993+
["L320", "uint64", true]
1994+
],
1995+
"gungame-obs": [
1996+
["L91", "uint64", true],
1997+
["L79", "uint64", true],
1998+
["L76", "uint64", true],
1999+
["L78", "uint64", true],
2000+
["L77", "uint64", true]
2001+
],
2002+
"gungame-data": [["L2388", "uint64", true]],
2003+
"gungame-manager": [
2004+
["L580", "uint64", true],
2005+
["L579", "uint64", true],
2006+
["L583", "uint64", true],
2007+
["L584", "uint64", true],
2008+
["L582", "uint64", true],
2009+
["L581", "uint64", true],
2010+
["L396", "uint64", true]
2011+
],
2012+
"mood-funcs2": [
2013+
["L115", "uint64", true],
2014+
["L116", "uint64", true],
2015+
["L117", "uint64", true],
2016+
["L118", "uint64", true],
2017+
["L120", "uint64", true],
2018+
["L119", "uint64", true],
2019+
["L121", "uint64", true]
2020+
],
2021+
"blow-tower-shared": [["L34", "(inline-array talker-speech-class)", 60]],
2022+
"blow-tower-obs": [
2023+
["L428", "uint64", true],
2024+
["L437", "uint64", true],
2025+
["L436", "uint64", true],
2026+
["L435", "uint64", true],
2027+
["L431", "uint64", true],
2028+
["L433", "uint64", true],
2029+
["L429", "uint64", true],
2030+
["L434", "uint64", true],
2031+
["L430", "uint64", true],
2032+
["L438", "uint64", true],
2033+
["L432", "uint64", true],
2034+
["L322", "uint64", true],
2035+
["L326", "uint64", true],
2036+
["L323", "uint64", true],
2037+
["L321", "uint64", true],
2038+
["L320", "uint64", true],
2039+
["L324", "uint64", true],
2040+
["L309", "attack-info"],
2041+
["L325", "uint64", true],
2042+
["L303", "attack-info"],
2043+
["L302", "attack-info"],
2044+
["L304", "attack-info"]
2045+
],
2046+
"blow-tower-obs2": [
2047+
["L681", "uint64", true],
2048+
["L683", "uint64", true],
2049+
["L686", "uint64", true],
2050+
["L684", "uint64", true],
2051+
["L680", "uint64", true],
2052+
["L685", "uint64", true],
2053+
["L682", "uint64", true],
2054+
["L565", "uint64", true],
2055+
["L563", "uint64", true],
2056+
["L562", "uint64", true],
2057+
["L559", "uint64", true],
2058+
["L571", "uint64", true],
2059+
["L560", "uint64", true],
2060+
["L572", "uint64", true],
2061+
["L574", "uint64", true],
2062+
["L570", "uint64", true],
2063+
["L577", "uint64", true],
2064+
["L585", "uint64", true],
2065+
["L549", "vector"],
2066+
["L548", "vector"],
2067+
["L547", "vector"],
2068+
["L567", "uint64", true],
2069+
["L587", "uint64", true],
2070+
["L566", "uint64", true],
2071+
["L579", "uint64", true],
2072+
["L564", "uint64", true],
2073+
["L581", "uint64", true],
2074+
["L573", "uint64", true],
2075+
["L569", "uint64", true],
2076+
["L580", "uint64", true],
2077+
["L576", "uint64", true],
2078+
["L521", "attack-info"],
2079+
["L586", "uint64", true],
2080+
["L578", "uint64", true],
2081+
["L575", "uint64", true],
2082+
["L582", "uint64", true],
2083+
["L583", "uint64", true],
2084+
["L558", "uint64", true],
2085+
["L584", "uint64", true],
2086+
["L561", "uint64", true],
2087+
["L533", "attack-info"],
2088+
["L568", "uint64", true]
2089+
],
2090+
"cty-blow-tower": [
2091+
["L1038", "bombbot-path"],
2092+
["L1283", "uint64", true],
2093+
["L1288", "uint64", true],
2094+
["L1281", "uint64", true],
2095+
["L1278", "uint64", true],
2096+
["L1282", "uint64", true],
2097+
["L1285", "uint64", true],
2098+
["L1287", "uint64", true],
2099+
["L1279", "uint64", true],
2100+
["L1286", "uint64", true],
2101+
["L1284", "uint64", true],
2102+
["L1280", "uint64", true],
2103+
["L1277", "uint64", true],
2104+
["L1051", "uint64", true],
2105+
["L1054", "uint64", true],
2106+
["L998", "(inline-array kg-squad-member-settings)", 4],
2107+
["L1053", "uint64", true],
2108+
["L1034", "(pointer float)", 4],
2109+
["L1043", "uint64", true],
2110+
["L1046", "uint64", true],
2111+
["L1048", "uint64", true],
2112+
["L1057", "uint64", true],
2113+
["L1045", "uint64", true],
2114+
["L1052", "uint64", true],
2115+
["L1042", "uint64", true],
2116+
["L1055", "uint64", true],
2117+
["L1050", "uint64", true],
2118+
["L1058", "uint64", true],
2119+
["L1041", "uint64", true],
2120+
["L1059", "uint64", true],
2121+
["L1049", "uint64", true],
2122+
["L1010", "attack-info"],
2123+
["L1047", "uint64", true],
2124+
["L1056", "uint64", true],
2125+
["L1044", "uint64", true]
19272126
]
19282127
}

‎decompiler/config/jak3/ntsc_v1/process_stack_size_overrides.jsonc

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"scene-player-init": 1024,
77
"task-manager-init-by-other": 2048,
88
"race-manager-init-by-other": 1024,
9-
"neo-sat-shield-init-by-other": 64
9+
"neo-sat-shield-init-by-other": 64,
10+
"bt-gun-manager-init-by-other": 256
1011
}

0 commit comments

Comments
 (0)