Skip to content

Commit

Permalink
decomp3: decompile remaining mission code (#3515)
Browse files Browse the repository at this point in the history
This should make all missions playable with the exception of the end of
`precursor-destroy-ship` because `precurd` asserts on level extraction.

- `trail`
- `trail-graph`
- `wastrail-graph`
- `cty-protect`
- `protect-gunship`
- `protect-path`
- `protect-script`
- `assault-cams`
- `assault-enemies`
- `assault-path`
- `assault-script`
- `assault-shared`
- `assault-task`
- `hover-nav-precura`
- `precura-mood`
- `precura-obs`
- `precura-obs2`
- `precura-part`
- `precurc-mood`
- `precurc-obs`
- `precurc-part`
- `precurd-obs`
- `precurd-part`
- `precurd-scenes`
  • Loading branch information
Hat-Kid authored May 16, 2024
1 parent 456d1ba commit c12a5d7
Show file tree
Hide file tree
Showing 121 changed files with 72,671 additions and 1,702 deletions.
1,583 changes: 767 additions & 816 deletions decompiler/config/jak3/all-types.gc

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions decompiler/config/jak3/ntsc_v1/anonymous_function_types.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -978,5 +978,27 @@
[27, "(function process symbol)"],
[46, "(function collide-shape-prim none)"],
[69, "(function process object)"]
],
"assault-enemies": [
[36, "(function assault-crimson-guard city-attacker-info int)"]
],
"assault-task": [[11, "(function symbol :behavior process)"]],
"precura-obs": [[98, "(function symbol :behavior process)"]],
"precurd-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)"],
[14, "(function none :behavior scene-player)"]
]
}
6 changes: 5 additions & 1 deletion decompiler/config/jak3/ntsc_v1/art_info.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@
"power-game-chaser": "flitter-ag",
"power-game-zapper": "grunt-head-ag",
"gungame-door": "fort-entry-gate-ag",
"bt-mh-flyer": "bt-wasp-ag"
"bt-mh-flyer": "bt-wasp-ag",
"gunship-exploder": "kg-robot-transport-break",
"gunship-engine": "kg-robot-transport-bomb",
"protect-gunship": "kg-robot-transport",
"gunship-missile": "cty-homing-missile"
},

// remap names for types in an entire file (higher priority)
Expand Down
4 changes: 2 additions & 2 deletions decompiler/config/jak3/ntsc_v1/hacks.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,8 @@
[346, 0],
[378, 0],
[413, 0]
]
],
"(trans carry precur-bomb)": [[60, 0]]
},

"mips2c_functions_by_name": [
Expand Down Expand Up @@ -711,7 +712,6 @@
"(method 21 cloth-system)",
"debug-line-clip?",
"(method 9 font-work)",
"(method 9 prim-strip)",
"live-func-curve",
"birth-func-curve",
"sparticle-motion-blur-dirt",
Expand Down
2 changes: 1 addition & 1 deletion decompiler/config/jak3/ntsc_v1/inputs.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"DGO/RAILE.DGO",
"DGO/RAILF.DGO",
"DGO/RAILX.DGO",
// // precursor
// precursor
"DGO/PRECA.DGO",
"DGO/PRECB.DGO",
"DGO/PRECC.DGO",
Expand Down
Loading

0 comments on commit c12a5d7

Please sign in to comment.