From adce4fd821e259f83752dc6bb2452bca1fd7106b Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Sat, 10 Jul 2021 16:00:05 -0400 Subject: [PATCH] stash --- decompiler/config/all-types.gc | 236 +++++------------- decompiler/config/jak1_ntsc_black_label.jsonc | 2 +- 2 files changed, 68 insertions(+), 170 deletions(-) diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index 656f88a0db..63fb1dc7b9 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -20135,7 +20135,7 @@ ;; - Functions (define-extern eco-blue-glow function) -(define-extern cloud-track function) +(define-extern cloud-track (function none)) ;; ---------------------- @@ -20146,179 +20146,77 @@ ;; - Types -; (deftype crate-bank (basic) -; ((COLLIDE_YOFF float :offset-assert 4) -; (COLLIDE_RADIUS float :offset-assert 8) -; (DARKECO_EXPLODE_RADIUS float :offset-assert 12) -; ) -; :method-count-assert 9 -; :size-assert #x10 -; :flag-assert #x900000010 -; ) +(deftype crate-bank (basic) + ((COLLIDE_YOFF float :offset-assert 4) + (COLLIDE_RADIUS float :offset-assert 8) + (DARKECO_EXPLODE_RADIUS float :offset-assert 12) + ) + :method-count-assert 9 + :size-assert #x10 + :flag-assert #x900000010 + ) -; (deftype crate (process-drawable) -; ((smush smush-control :inline :offset-assert 176) -; (base vector :inline :offset-assert 208) -; (look basic :offset-assert 224) -; (defense basic :offset-assert 228) -; (incomming-attack-id uint64 :offset-assert 232) -; (target uint64 :offset-assert 240) -; (child-count int32 :offset-assert 248) -; (victory-anim basic :offset-assert 252) -; ) -; :method-count-assert 30 -; :size-assert #x100 -; :flag-assert #x1e00900100 -; ;; inherited inspect of process-drawable -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (dummy-14 () none 14) -; (dummy-15 () none 15) -; (dummy-16 () none 16) -; (dummy-17 () none 17) -; (dummy-18 () none 18) -; (dummy-19 () none 19) -; (dummy-20 () none 20) -; (dummy-21 () none 21) -; (dummy-22 () none 22) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; ) -; ) +(deftype crate (process-drawable) + ((smush smush-control :inline :offset-assert 176) + (base vector :inline :offset-assert 208) + (look basic :offset-assert 224) + (defense basic :offset-assert 228) + (incomming-attack-id uint64 :offset-assert 232) + (target uint64 :offset-assert 240) + (child-count int32 :offset-assert 248) + (victory-anim basic :offset-assert 252) + ) + :method-count-assert 30 + :heap-base #x90 + :size-assert #x100 + :flag-assert #x1e00900100 + ;; inherited inspect of process-drawable + (:methods + (dummy-20 () none 20) + (dummy-21 () none 21) + (dummy-22 () none 22) + (dummy-23 () none 23) + (dummy-24 () none 24) + (dummy-25 () none 25) + (dummy-26 () none 26) + (dummy-27 () none 27) + (dummy-28 () none 28) + (dummy-29 () none 29) + ) + ) -; (deftype barrel (crate) -; () -; :method-count-assert 30 -; :size-assert #x100 -; :flag-assert #x1e00900100 -; ;; not enough basic ops -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (dummy-14 () none 14) -; (dummy-15 () none 15) -; (dummy-16 () none 16) -; (dummy-17 () none 17) -; (dummy-18 () none 18) -; (dummy-19 () none 19) -; (dummy-20 () none 20) -; (dummy-21 () none 21) -; (dummy-22 () none 22) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; ) -; ) +(deftype barrel (crate) + () + :method-count-assert 30 + :heap-base #x90 + :size-assert #x100 + :flag-assert #x1e00900100 + ) -; (deftype bucket (crate) -; () -; :method-count-assert 30 -; :size-assert #x100 -; :flag-assert #x1e00900100 -; ;; not enough basic ops -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (dummy-14 () none 14) -; (dummy-15 () none 15) -; (dummy-16 () none 16) -; (dummy-17 () none 17) -; (dummy-18 () none 18) -; (dummy-19 () none 19) -; (dummy-20 () none 20) -; (dummy-21 () none 21) -; (dummy-22 () none 22) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; ) -; ) +(deftype bucket (crate) + () + :method-count-assert 30 + :heap-base #x90 + :size-assert #x100 + :flag-assert #x1e00900100 + ) -; (deftype crate-buzzer (crate) -; () -; :method-count-assert 30 -; :size-assert #x100 -; :flag-assert #x1e00900100 -; ;; not enough basic ops -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (dummy-14 () none 14) -; (dummy-15 () none 15) -; (dummy-16 () none 16) -; (dummy-17 () none 17) -; (dummy-18 () none 18) -; (dummy-19 () none 19) -; (dummy-20 () none 20) -; (dummy-21 () none 21) -; (dummy-22 () none 22) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; ) -; ) +(deftype crate-buzzer (crate) + () + :method-count-assert 30 + :heap-base #x90 + :size-assert #x100 + :flag-assert #x1e00900100 + ) -; (deftype pickup-spawner (crate) -; ((blocker basic :offset-assert 256) -; ) -; :method-count-assert 30 -; :size-assert #x104 -; :flag-assert #x1e00a00104 -; ;; inherited inspect of crate -; (:methods -; (dummy-9 () none 9) -; (dummy-10 () none 10) -; (dummy-11 () none 11) -; (dummy-12 () none 12) -; (dummy-13 () none 13) -; (dummy-14 () none 14) -; (dummy-15 () none 15) -; (dummy-16 () none 16) -; (dummy-17 () none 17) -; (dummy-18 () none 18) -; (dummy-19 () none 19) -; (dummy-20 () none 20) -; (dummy-21 () none 21) -; (dummy-22 () none 22) -; (dummy-23 () none 23) -; (dummy-24 () none 24) -; (dummy-25 () none 25) -; (dummy-26 () none 26) -; (dummy-27 () none 27) -; (dummy-28 () none 28) -; (dummy-29 () none 29) -; ) -; ) +(deftype pickup-spawner (crate) + ((blocker basic :offset-assert 256) + ) + :method-count-assert 30 + :heap-base #xa0 + :size-assert #x104 + :flag-assert #x1e00a00104 + ) ;; - Functions diff --git a/decompiler/config/jak1_ntsc_black_label.jsonc b/decompiler/config/jak1_ntsc_black_label.jsonc index 64fea87854..a421fab0a9 100644 --- a/decompiler/config/jak1_ntsc_black_label.jsonc +++ b/decompiler/config/jak1_ntsc_black_label.jsonc @@ -3,7 +3,7 @@ // if you want to filter to only some object names. // it will make the decompiler much faster. - "allowed_objects": [], + "allowed_objects": ["crates"], //////////////////////////// // CODE ANALYSIS OPTIONS