decomp: finish basebutton (#762)

* decomp: finish `basebutton`

* decomp: finalize `basebutton` and fix `evilbro`

* fix some methods / args
This commit is contained in:
Tyler Wilding
2021-08-22 23:16:55 -04:00
committed by GitHub
parent 9befd8ed03
commit 05648e0a96
22 changed files with 2402 additions and 125 deletions
@@ -407,7 +407,7 @@
(:methods
(new (symbol type process collide-list-enum) _type_ 0)
(TODO-RENAME-28 (_type_) none 28)
(dummy-29 () none 29)
(dummy-29 (_type_ int) none 29)
(TODO-RENAME-30 (_type_ vector) none 30)
(dummy-31 () none 31)
(dummy-32 () none 32)
@@ -127,7 +127,10 @@
(unknown-dword40 int64 :offset 2160)
(unknown-dword41 int64 :offset 2168)
(unknown-handle10 handle :offset 2176)
(unknown-int11 int32 :offset 2184)
(unknown-int20 int32 :offset 2188)
(unknown-vector102 vector :inline :offset 2224)
(unknown-vector103 vector :inline :offset 2240)
(unknown-vector110 vector :inline :offset 2320)
(unknown-vector111 vector :inline :offset 2336)
(unknown-int30 int32 :offset 2384)
File diff suppressed because it is too large Load Diff
+1 -4
View File
@@ -1100,10 +1100,7 @@
(set! (-> s5-0 dynam) (copy *standard-dynamics* 'process))
(set! (-> s5-0 reaction) default-collision-reaction)
(set! (-> s5-0 no-reaction) nothing)
(let ((t9-2 (method-of-object s5-0 dummy-29)))
1
(t9-2)
)
(dummy-29 s5-0 1)
(let
((s4-0
(new
+5 -16
View File
@@ -3,7 +3,7 @@
;; definition of type evilbro
(deftype evilbro (process-taskable)
((evilsis evilsis :offset-assert 380)
((evilsis entity :offset-assert 380)
)
:heap-base #x110
:method-count-assert 53
@@ -52,16 +52,8 @@
(set! (-> a1-2 from) pp)
(set! (-> a1-2 num-params) 1)
(set! (-> a1-2 message) 'clone)
(let ((v1-2 (process->ppointer obj)))
(set!
(-> a1-2 param 0)
(the-as
uint
(logior (shl (-> v1-2 0 pid) 32) (new 'static 'handle :process v1-2))
)
)
)
(send-event-function (-> obj evilsis ppointer 3) a1-2)
(set! (-> a1-2 param 0) (the-as uint (process->handle obj)))
(send-event-function (-> obj evilsis extra process) a1-2)
)
)
(else
@@ -94,7 +86,7 @@
(set! (-> a1-0 from) self)
(set! (-> a1-0 num-params) 0)
(set! (-> a1-0 message) 'end-mode)
(send-event-function (-> self evilsis ppointer 3) a1-0)
(send-event-function (-> self evilsis extra process) a1-0)
)
((-> (method-of-type process-taskable play-anim) exit))
(none)
@@ -246,10 +238,7 @@
(defmethod copy-defaults! evilbro ((obj evilbro) (arg0 res-lump))
(dummy-40 obj arg0 *evilbro-intro-sg* 3 40 (new 'static 'vector :w 4096.0) 5)
(set! (-> obj tasks) (get-task-control (game-task leaving-misty)))
(set!
(-> obj evilsis)
(the-as evilsis (entity-actor-lookup arg0 'alt-actor 0))
)
(set! (-> obj evilsis) (entity-actor-lookup arg0 'alt-actor 0))
(dummy-42 obj)
(none)
)
@@ -308,10 +308,7 @@
(set! (-> s4-0 dynam) (copy *standard-dynamics* 'process))
(set! (-> s4-0 reaction) default-collision-reaction)
(set! (-> s4-0 no-reaction) nothing)
(let ((t9-2 (method-of-object s4-0 dummy-29)))
1
(t9-2)
)
(dummy-29 s4-0 1)
(let ((s3-0 (new 'process 'collide-shape-prim-group s4-0 (the-as uint 5) 0)))
(set! (-> s3-0 prim-core collide-as) (the-as uint 2048))
(set! (-> s3-0 collide-with) (the-as uint 16))
@@ -228,10 +228,7 @@
(set! (-> s4-0 dynam) (copy *standard-dynamics* 'process))
(set! (-> s4-0 reaction) default-collision-reaction)
(set! (-> s4-0 no-reaction) nothing)
(let ((t9-2 (method-of-object s4-0 dummy-29)))
1
(t9-2)
)
(dummy-29 s4-0 1)
(let
((s3-0
(new