decomp: finish orbit-plat and sage-finalboss (#1039)

* decomp: finish `orbit-plat` and waiting on `sage-finalboss` inconsistency for gsrc

* decomp: finish `sage-finalboss` except the relocate method

* decomp: add fix to finish `sage-finalboss`

* update formatting in unrelated files
This commit is contained in:
Tyler Wilding
2022-01-04 23:10:53 -05:00
committed by GitHub
parent c35ab4a223
commit a75ecf176e
26 changed files with 5013 additions and 969 deletions
@@ -4881,6 +4881,8 @@ void ArrayFieldAccess::update_with_val(Form* new_val,
{reg0_matcher, Matcher::integer(m_expected_stride)});
mult_matcher = Matcher::match_or({Matcher::cast("uint", mult_matcher), mult_matcher});
auto matcher = Matcher::fixed_op(FixedOperatorKind::ADDITION, {mult_matcher, reg1_matcher});
matcher = Matcher::match_or({matcher, Matcher::fixed_op(FixedOperatorKind::ADDITION_PTR,
{reg1_matcher, mult_matcher})});
auto match_result = match(matcher, new_val);
Form* idx = nullptr;
Form* base = nullptr;
+10 -8
View File
@@ -27171,10 +27171,10 @@
((part sparticle-launch-control :offset-assert 0)
(active symbol :offset-assert 4)
)
:allow-misaligned
:method-count-assert 9
:size-assert #x8
:flag-assert #x900000008
:allow-misaligned
)
(deftype sage-finalboss (process-taskable)
@@ -33051,6 +33051,8 @@
(:methods
(dummy-20 (_type_ vector vector) none 20)
)
(:states
orbit-plat-bottom-idle)
)
(deftype orbit-plat (baseplat)
@@ -33070,6 +33072,13 @@
(dummy-27 (_type_) symbol 27)
(dummy-28 (_type_) symbol 28)
)
(:states
orbit-plat-wait-for-other
orbit-plat-idle
orbit-plat-riding
orbit-plat-rotating
orbit-plat-still
orbit-plat-reset)
)
;; - Functions
@@ -33081,14 +33090,7 @@
;; - Unknowns
(define-extern *orbit-plat-sg* skeleton-group)
(define-extern orbit-plat-wait-for-other (state orbit-plat)) ;; unknown type
(define-extern orbit-plat-idle (state orbit-plat)) ;; unknown type
(define-extern orbit-plat-riding (state orbit-plat)) ;; unknown type
(define-extern orbit-plat-rotating (state orbit-plat)) ;; unknown type
(define-extern orbit-plat-still (state orbit-plat)) ;; unknown type
(define-extern orbit-plat-reset (state orbit-plat)) ;; unknown type
(define-extern *orbit-plat-bottom-sg* skeleton-group)
(define-extern orbit-plat-bottom-idle (state orbit-plat-bottom)) ;; unknown type
;; ----------------------
@@ -4002,23 +4002,26 @@
"(method 32 sage-finalboss)": [
[[241, 245], "v1", "manipy"],
[[309, 313], "v1", "manipy"]
[[309, 313], "v1", "manipy"],
[313, "v1", "silodoor"]
],
"(trans play-anim sage-finalboss)": [
[[179, 183], "a0", "manipy"],
[[216, 220], "a0", "manipy"],
[[295, 299], "a1", "manipy"],
[[334, 338], "a1", "manipy"],
[[371, 375], "a1", "manipy"],
[391, "v0", "final-door"],
[396, "v0", "final-door"]
],
"(method 7 sage-finalboss)": [
[2, "v1", "(inline-array sage-finalboss-particle)"],
[6, "v1", "(inline-array sage-finalboss-particle)"],
[10, "v1", "(inline-array sage-finalboss-particle)"]
[186, "v1", "process-drawable"],
[223, "v1", "process-drawable"],
[300, "v1", "process-drawable"],
[339, "v1", "process-drawable"],
[376, "v1", "process-drawable"],
[399, "gp", "final-door"],
[401, "a0", "final-door"]
// [[179, 183], "a0", "manipy"],
// [[182, 187], "v1", "manipy"],
// [[216, 220], "a0", "manipy"],
// [[295, 299], "a1", "manipy"],
// [[334, 338], "a1", "manipy"],
// [[371, 375], "a1", "manipy"],
// [391, "v0", "final-door"],
// [396, "v0", "final-door"]
],
"(trans fisher-done)": [[[41, 46], "v1", "dma-packet"]],
@@ -3607,12 +3607,6 @@
}
},
"(method 7 sage-finalboss)": {
"vars": {
"v1-0": ["v1-0", "(inline-array sage-finalboss-particle)"]
}
},
"(code robotboss-white-eco-movie)": {
"vars": {
"gp-1": ["gp-1", "handle"]