Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

decomp: finish cave-trap #1015

Merged
merged 4 commits into from
Dec 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions decompiler/config/all-types.gc
Original file line number Diff line number Diff line change
Expand Up @@ -34988,6 +34988,10 @@
(:methods
(TODO-RENAME-20 (_type_) symbol 20)
)
(:states
cave-trap-idle
cave-trap-give-up
cave-trap-active)
)

(deftype spider-vent (process-drawable)
Expand All @@ -34997,6 +35001,8 @@
:size-assert #xb8
:heap-base #x50
:flag-assert #x14005000b8
(:states
spider-vent-idle)
)

(deftype spawn-baby-spider-best (structure)
Expand All @@ -35020,13 +35026,6 @@

(define-extern cave-trap-default-event-handler (function process int symbol event-message-block object :behavior cave-trap))

;; - Unknowns

(define-extern cave-trap-idle (state cave-trap)) ;; unknown type
(define-extern cave-trap-give-up (state cave-trap)) ;; unknown type
(define-extern cave-trap-active (state cave-trap)) ;; unknown type
(define-extern spider-vent-idle (state spider-vent)) ;; unknown type


;; ----------------------
;; File - spider-egg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2838,9 +2838,9 @@
[16, "spawn-baby-spider-work"],
[80, "vector"],
[96, "event-message-block"],
[176, "vector"],
[176, "sphere"],
[192, "vector"],
[208, "vector"]
[208, "baby-spider-spawn-params"]
],

"(trans cave-trap-idle)": [[16, "event-message-block"]],
Expand Down
3 changes: 2 additions & 1 deletion decompiler/config/jak1_ntsc_black_label/type_casts.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -3185,7 +3185,8 @@
[77, "s2", "process-drawable"],
[95, "s2", "process-drawable"],
[181, "s3", "process-drawable"],
[221, "s3", "process-drawable"]
[221, "s3", "process-drawable"],
[230, "v1", "baby-spider"]
],

"(method 7 cave-trap)": [
Expand Down
Loading