Archive/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project.git synced 2024-10-20 11:26:18 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

decomp: mood-tables (#460)

Browse source 
* decomp: Decompile `mood-tables`

* decomp: Cleanup `mood-tables` and add REF file

* all-types cleanup

* decomp: Add missing float types (that may be optional now)

* linting / formatting
This commit is contained in:
Tyler Wilding 2021-05-12 19:33:29 -04:00 committed by GitHub
parent 8d4b644a14
commit 3897258753
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8601 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

184
decompiler/config/all-types.gc
View file

@ -34626,103 +34626,103 @@
;;(define-extern play-hints object) ;; unknown type
;;(define-extern music-volume-movie object) ;; unknown type
(define-extern set-aspect-ratio function)
;;(define-extern *rolling-mood* object) ;; unknown type
;;(define-extern *misty-mood* object) ;; unknown type
;;(define-extern *ogre-mood-fog-table* object) ;; unknown type
;;(define-extern *citadel-mood-sun-table* object) ;; unknown type
;;(define-extern *lavatube-mood-lights-table* object) ;; unknown type
;;(define-extern *citadel-mood* object) ;; unknown type
;;(define-extern *swamp-mood-fog-table* object) ;; unknown type
;;(define-extern *firecanyon-mood-lights-table* object) ;; unknown type
;;(define-extern *sunken-mood-lights-table* object) ;; unknown type
;;(define-extern *training-mood-fog-table* object) ;; unknown type
;;(define-extern *ogre3-mood-fog-table* object) ;; unknown type
;;(define-extern *swamp-mood-sun-table* object) ;; unknown type
;;(define-extern *ogre2-mood-lights-table* object) ;; unknown type
;;(define-extern *finalboss-interp-table* object) ;; unknown type
;;(define-extern *firecanyon-mood-sun-table* object) ;; unknown type
;;(define-extern *firecanyon-mood-fog-table* object) ;; unknown type
;;(define-extern *darkcave-mood-fog-table* object) ;; unknown type
;;(define-extern *village1-mood* object) ;; unknown type
;;(define-extern *maincave-mood-fog-table* object) ;; unknown type
;;(define-extern *jungleb-mood-sun-table* object) ;; unknown type
;;(define-extern *village1-mood-sun-table* object) ;; unknown type
;;(define-extern *lavatube-mood-sun-table* object) ;; unknown type
;;(define-extern *village3-mood-fog-table* object) ;; unknown type
;;(define-extern *village1-mood-lights-table* object) ;; unknown type
;;(define-extern *rolling-mood-sun-table* object) ;; unknown type
;;(define-extern *ogre2-mood* object) ;; unknown type
;;(define-extern *lavatube-mood* object) ;; unknown type
;;(define-extern *misty-mood-fog-table* object) ;; unknown type
;;(define-extern *darkcave-mood-lights-table* object) ;; unknown type
;;(define-extern *maincave-mood-lights-table* object) ;; unknown type
(define-extern make-rolling-light-kit function)
;;(define-extern *jungleb-mood* object) ;; unknown type
;;(define-extern *default-interp-table* object) ;; unknown type
;;(define-extern *misty-mood-sun-table* object) ;; unknown type
;;(define-extern *village1-mood-fog-table* object) ;; unknown type
;;(define-extern *village1-palette-interp-table* object) ;; unknown type
;;(define-extern *robocave-mood* object) ;; unknown type
(define-extern make-village3-light-kit function)
;;(define-extern *sunken-mood-sun-table* object) ;; unknown type
;;(define-extern *village2-sky-texture-table* object) ;; unknown type
;;(define-extern *default-mood* object) ;; unknown type
;;(define-extern *snow-mood* object) ;; unknown type
;;(define-extern *sunkenb-mood* object) ;; unknown type
;;(define-extern *sunken-mood* object) ;; unknown type
;;(define-extern *jungle-mood* object) ;; unknown type
(define-extern update-mood-erase-color function)
(define-extern make-village1-light-kit function)
;;(define-extern *snow-mood-sun-table* object) ;; unknown type
;;(define-extern *citadel-mood-lights-table* object) ;; unknown type
;;(define-extern *finalboss-mood* object) ;; unknown type
;;(define-extern *firecanyon-palette-interp-table* object) ;; unknown type
(define-extern update-mood-erase-color2 function)
;;(define-extern *snow-mood-lights-table* object) ;; unknown type
;;(define-extern *maincave-mood* object) ;; unknown type
;;(define-extern *village2-mood* object) ;; unknown type
;;(define-extern *darkcave-mood* object) ;; unknown type
;;(define-extern *village3-mood* object) ;; unknown type
;;(define-extern *swamp-mood-lights-table* object) ;; unknown type
;;(define-extern *village2-mood-lights-table* object) ;; unknown type
;;(define-extern *village2-mood-sun-table* object) ;; unknown type
;;(define-extern *village3-mood-lights-table* object) ;; unknown type
;;(define-extern *ogre3-mood-lights-table* object) ;; unknown type
;;(define-extern *rolling-mood-lights-table* object) ;; unknown type
;;(define-extern *finalboss2-mood* object) ;; unknown type
;;(define-extern *rolling-palette-interp-table* object) ;; unknown type
;;(define-extern *beach-mood* object) ;; unknown type
;;(define-extern *ogre-mood* object) ;; unknown type
(define-extern update-mood-shadow-direction function)
(define-extern make-light-kit function)
;;(define-extern *jungleb-mood-lights-table* object) ;; unknown type
;;(define-extern *village2-mood-fog-table* object) ;; unknown type
;;(define-extern *swamp-mood* object) ;; unknown type
;;(define-extern *firecanyon-mood* object) ;; unknown type
;;(define-extern *lavatube-mood-fog-table* object) ;; unknown type
;;(define-extern *ogre-mood-lights-table* object) ;; unknown type
(define-extern make-village2-light-kit function)
;;(define-extern *misty-mood-lights-table* object) ;; unknown type
;;(define-extern *ogre3-mood* object) ;; unknown type
;;(define-extern *citadel-mood-fog-table* object) ;; unknown type
;;(define-extern *sunken-mood-fog-table* object) ;; unknown type
(define-extern make-misty-light-kit function)
;;(define-extern *snow-mood-fog-table* object) ;; unknown type
;;(define-extern *jungleb-mood-fog-table* object) ;; unknown type
;;(define-extern *misty-palette-interp-table* object) ;; unknown type
;;(define-extern *rolling-mood-fog-table* object) ;; unknown type
;;(define-extern *training-mood* object) ;; unknown type
;;(define-extern *finalboss-mood-fog-table* object) ;; unknown type
;;(define-extern *darkcave-mood-sun-table* object) ;; unknown type
;;(define-extern *maincave-mood-sun-table* object) ;; unknown type
;;(define-extern *robocave-mood-fog-table* object) ;; unknown type
;;(define-extern *finalboss-mood-sun-table* object) ;; unknown type
(define-extern *rolling-mood* mood-context)
(define-extern *misty-mood* mood-context)
(define-extern *ogre-mood-fog-table* mood-fog-table)
(define-extern *citadel-mood-sun-table* mood-sun-table)
(define-extern *lavatube-mood-lights-table* mood-lights-table)
(define-extern *citadel-mood* mood-context)
(define-extern *swamp-mood-fog-table* mood-fog-table)
(define-extern *firecanyon-mood-lights-table* mood-lights-table)
(define-extern *sunken-mood-lights-table* mood-lights-table)
(define-extern *training-mood-fog-table* mood-fog-table)
(define-extern *ogre3-mood-fog-table* mood-fog-table)
(define-extern *swamp-mood-sun-table* mood-sun-table)
(define-extern *ogre2-mood-lights-table* mood-lights-table)
(define-extern *finalboss-interp-table* sky-color-day)
(define-extern *firecanyon-mood-sun-table* mood-sun-table)
(define-extern *firecanyon-mood-fog-table* mood-fog-table)
(define-extern *darkcave-mood-fog-table* mood-fog-table)
(define-extern *village1-mood* mood-context)
(define-extern *maincave-mood-fog-table* mood-fog-table)
(define-extern *jungleb-mood-sun-table* mood-sun-table)
(define-extern *village1-mood-sun-table* mood-sun-table)
(define-extern *lavatube-mood-sun-table* mood-sun-table)
(define-extern *village3-mood-fog-table* mood-fog-table)
(define-extern *village1-mood-lights-table* mood-lights-table)
(define-extern *rolling-mood-sun-table* mood-sun-table)
(define-extern *ogre2-mood* mood-context)
(define-extern *lavatube-mood* mood-context)
(define-extern *misty-mood-fog-table* mood-fog-table)
(define-extern *darkcave-mood-lights-table* mood-lights-table)
(define-extern *maincave-mood-lights-table* mood-lights-table)
(define-extern make-rolling-light-kit (function mood-context none))
(define-extern *jungleb-mood* mood-context)
(define-extern *default-interp-table* sky-color-day)
(define-extern *misty-mood-sun-table* mood-sun-table)
(define-extern *village1-mood-fog-table* mood-fog-table)
(define-extern *village1-palette-interp-table* sky-color-day)
(define-extern *robocave-mood* mood-context)
(define-extern make-village3-light-kit (function mood-context none))
(define-extern *sunken-mood-sun-table* mood-sun-table)
(define-extern *village2-sky-texture-table* sky-color-day)
(define-extern *default-mood* mood-context)
(define-extern *snow-mood* mood-context)
(define-extern *sunkenb-mood* mood-context)
(define-extern *sunken-mood* mood-context)
(define-extern *jungle-mood* mood-context)
(define-extern update-mood-erase-color (function mood-fog mood-lights none))
(define-extern make-village1-light-kit (function mood-context none))
(define-extern *snow-mood-sun-table* mood-sun-table)
(define-extern *citadel-mood-lights-table* mood-lights-table)
(define-extern *finalboss-mood* mood-context)
(define-extern *firecanyon-palette-interp-table* sky-color-day)
(define-extern update-mood-erase-color2 (function mood-fog mood-lights mood-lights none))
(define-extern *snow-mood-lights-table* mood-lights-table)
(define-extern *maincave-mood* mood-context)
(define-extern *village2-mood* mood-context)
(define-extern *darkcave-mood* mood-context)
(define-extern *village3-mood* mood-context)
(define-extern *swamp-mood-lights-table* mood-lights-table)
(define-extern *village2-mood-lights-table* mood-lights-table)
(define-extern *village2-mood-sun-table* mood-sun-table)
(define-extern *village3-mood-lights-table* mood-lights-table)
(define-extern *ogre3-mood-lights-table* mood-lights-table)
(define-extern *rolling-mood-lights-table* mood-lights-table)
(define-extern *finalboss2-mood* mood-context)
(define-extern *rolling-palette-interp-table* sky-color-day)
(define-extern *beach-mood* mood-context)
(define-extern *ogre-mood* mood-context)
(define-extern update-mood-shadow-direction (function mood-lights none))
(define-extern make-light-kit (function light-group float float float float float))
(define-extern *jungleb-mood-lights-table* mood-lights-table)
(define-extern *village2-mood-fog-table* mood-fog-table)
(define-extern *swamp-mood* mood-context)
(define-extern *firecanyon-mood* mood-context)
(define-extern *lavatube-mood-fog-table* mood-fog-table)
(define-extern *ogre-mood-lights-table* mood-lights-table)
(define-extern make-village2-light-kit (function mood-context none))
(define-extern *misty-mood-lights-table* mood-lights-table)
(define-extern *ogre3-mood* mood-context)
(define-extern *citadel-mood-fog-table* mood-fog-table)
(define-extern *sunken-mood-fog-table* mood-fog-table)
(define-extern make-misty-light-kit (function mood-context none))
(define-extern *snow-mood-fog-table* mood-fog-table)
(define-extern *jungleb-mood-fog-table* mood-fog-table)
(define-extern *misty-palette-interp-table* sky-color-day)
(define-extern *rolling-mood-fog-table* mood-fog-table)
(define-extern *training-mood* mood-context)
(define-extern *finalboss-mood-fog-table* mood-fog-table)
(define-extern *darkcave-mood-sun-table* mood-sun-table)
(define-extern *maincave-mood-sun-table* mood-sun-table)
(define-extern *robocave-mood-fog-table* mood-fog-table)
(define-extern *finalboss-mood-sun-table* mood-sun-table)
;;(define-extern *flash0* object) ;; unknown type
;;(define-extern *lava-time* object) ;; unknown type
(define-extern update-mood-robocave function)
(define-extern update-mood-maincave function)
(define-extern update-mood-citadel function)
(define-extern update-mood-fog function)
(define-extern update-mood-fog (function mood-fog mood-lights-table none))
(define-extern update-mood-prt-color function)
;;(define-extern *flash4* object) ;; unknown type
(define-extern update-mood-rolling function)

141
decompiler/config/jak1_ntsc_black_label/label_types.jsonc
View file

@ -60,9 +60,11 @@
],
"dma-disasm": [["L148", "(array vif-disasm-element)", true]],
"gs": [["L53", "gif-tag64", true],
["L51", "gif-tag-regs", true],
["L52", "uint64", true]],
"gs": [
["L53", "gif-tag64", true],
["L51", "gif-tag-regs", true],
["L52", "uint64", true]
],
"display-h": [["L6", "rgba", true]],
@ -98,15 +100,16 @@
["L2", "pair", true]
],
"level-h": [["L3", "_auto_", true]],
"level-h": [
["L3", "level-group", true],
["L3", "_auto_", true]
],
"font-h": [
["L18", "matrix", true],
["L17", "font-work", true]
],
"text-h": [["L2", "_auto_", true]],
"display": [
["L87", "float", true],
["L76", "(pointer uint32)", true, 2],
@ -159,10 +162,8 @@
// see comment in ocean-tables.gc
// ["L26", "ocean-spheres", true],
// ["L18", "ocean-spheres", true],
// ["L25", "ocean-colors", true],
// ["L17", "ocean-colors", true],
// ["L23", "ocean-near-indices", true],
// ["L15", "ocean-near-indices", true],
// ["L9", "ocean-near-indices", true],
@ -175,7 +176,6 @@
// ["L19", "ocean-mid-masks", true],
// ["L11", "ocean-mid-masks", true],
// ["L5", "ocean-mid-masks", true],
// ["L4", "ocean-map", true],
// ["L3", "ocean-map", true],
// ["L2", "ocean-map", true]
@ -276,7 +276,126 @@
["L371", "uint64", true]
],
"hud-h": [
["L1", "hud-parts", true]
"lights": [
["L8", "float", true],
["L9", "float", true],
["L10", "float", true]
],
"hud-h": [["L1", "hud-parts", true]],
"mood-tables": [
["L12", "mood-sun-table", true],
["L13", "mood-lights-table", true],
["L14", "mood-fog-table", true],
["L15", "mood-fog-table", true],
["L16", "mood-sun-table", true],
["L17", "mood-sun-table", true],
["L18", "mood-lights-table", true],
["L19", "mood-fog-table", true],
["L20", "mood-lights-table", true],
["L21", "mood-fog-table", true],
["L22", "mood-lights-table", true],
["L23", "mood-fog-table", true],
["L24", "mood-lights-table", true],
["L25", "mood-lights-table", true],
["L26", "mood-fog-table", true],
["L27", "mood-sun-table", true],
["L28", "mood-lights-table", true],
["L29", "mood-fog-table", true],
["L30", "mood-sun-table", true],
["L31", "mood-lights-table", true],
["L32", "mood-fog-table", true],
["L33", "mood-sun-table", true],
["L34", "mood-lights-table", true],
["L35", "mood-fog-table", true],
["L36", "mood-sun-table", true],
["L37", "mood-lights-table", true],
["L38", "mood-fog-table", true],
["L39", "mood-sun-table", true],
["L40", "mood-lights-table", true],
["L41", "mood-fog-table", true],
["L42", "mood-sun-table", true],
["L43", "mood-lights-table", true],
["L44", "mood-fog-table", true],
["L45", "mood-sun-table", true],
["L46", "mood-lights-table", true],
["L47", "mood-fog-table", true],
["L48", "mood-fog-table", true],
["L49", "mood-sun-table", true],
["L50", "mood-lights-table", true],
["L51", "mood-fog-table", true],
["L52", "mood-sun-table", true],
["L53", "mood-lights-table", true],
["L54", "mood-fog-table", true],
["L55", "mood-sun-table", true],
["L56", "mood-lights-table", true],
["L57", "mood-fog-table", true],
["L58", "mood-fog-table", true],
["L59", "mood-sun-table", true],
["L60", "mood-lights-table", true],
["L61", "mood-fog-table", true],
["L62", "sky-color-day", true],
["L63", "sky-color-day", true],
["L64", "sky-color-day", true],
["L65", "sky-color-day", true],
["L66", "sky-color-day", true],
["L67", "sky-color-day", true],
["L68", "sky-color-day", true],
["L69", "float", true],
["L70", "float", true],
["L71", "float", true],
["L72", "float", true],
["L73", "float", true],
["L74", "float", true],
["L75", "float", true],
["L76", "float", true],
["L77", "float", true],
["L78", "float", true],
["L79", "float", true],
["L80", "float", true],
["L81", "float", true],
["L82", "float", true],
["L83", "float", true],
["L84", "float", true],
["L85", "float", true],
["L86", "float", true],
["L87", "float", true],
["L88", "float", true],
["L89", "float", true],
["L90", "float", true],
["L91", "float", true],
["L92", "float", true],
["L93", "float", true],
["L94", "float", true],
["L95", "float", true],
["L96", "float", true],
["L97", "float", true],
["L98", "float", true],
["L99", "float", true],
["L100", "float", true],
["L101", "float", true],
["L102", "float", true],
["L103", "float", true],
["L104", "float", true],
["L105", "float", true],
["L106", "float", true],
["L107", "float", true],
["L108", "float", true],
["L109", "float", true],
["L110", "float", true],
["L111", "float", true],
["L112", "float", true],
["L113", "float", true],
["L114", "float", true],
["L115", "float", true],
["L116", "float", true],
["L117", "float", true],
["L118", "float", true],
["L119", "float", true],
["L121", "float", true],
["L122", "float", true],
["L123", "float", true],
["L124", "float", true]
]
}

6
decompiler/config/jak1_ntsc_black_label/stack_vars.jsonc
View file

@ -143,5 +143,9 @@
"(method 10 oscillating-vector)":[[16, "vector"]],
"show-mc-info": [[16, "mc-slot-info"]]
"show-mc-info": [[16, "mc-slot-info"]],
"update-mood-erase-color2": [[16, "mood-fog"]],
"make-light-kit": [[16, "matrix"]]
}

3903
goal_src/engine/ambient/mood-tables.gc
View file

File diff suppressed because it is too large Load diff

4471
test/decompiler/reference/engine/ambient/mood-tables_REF.gc Normal file
View file

File diff suppressed because it is too large Load diff