decomp: merge all s6-* remappings and finish training-obs | villagep-obs | lavatube-obs | rolling-robber | snow-obs
#1018
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 1580812697
💛 - Coveralls |
xTVaser
force-pushed
the
decomp/merge-s6-vars
branch
from
84ffbc9
to
e65465d
Compare
xTVaser
changed the title
s6-* remappings and finish training-obs | villagep-obs | lavatube-obs | rolling-robbers6-* remappings and finish training-obs | villagep-obs | lavatube-obs | rolling-robber | snow-obs
water111
reviewed
Dec 29, 2021
|
|
||
| (deftype darkecobarrel (darkecobarrel-base) | ||
| ((self-override darkecobarrel :offset 28) | ||
| (spawn-array (array handle) :offset-assert 192) |
There was a problem hiding this comment.
I think this might be an array int64 but I'm not 100% sure...
| (if (and (> (-> self cur-spawn) 0) (< gp-1 (the-as int (-> self spawn-array (+ (-> self cur-spawn) -1))))) | ||
| (+! gp-1 (the-as int (darkecobarrel-cycle-time))) | ||
| ) | ||
| (let ((gp-2 (- gp-1 (the-as int (-> self spawn-array (-> self cur-spawn)))))) |
There was a problem hiding this comment.
this would make more sense as int
| (defstate darkecobarrel-spawner (darkecobarrel) | ||
| :trans | ||
| (behavior () | ||
| (let ((gp-1 (mod (darkecobarrel-base-time) (the-as int (darkecobarrel-cycle-time))))) |
There was a problem hiding this comment.
and darkecobarrel-cycle-time would return int as well
| (set! (-> obj flags) (logior #x2000000 (-> obj flags))) | ||
| (let ((v0-2 'heat)) | ||
| (set! (-> obj attack-event) v0-2) | ||
| (the-as ripple-wave-set v0-2) |
There was a problem hiding this comment.
I'd guess this function returns none
| (defbehavior robber-find-ground robber () | ||
| (let ((gp-0 (new 'stack-no-clear 'vector))) | ||
| (set! (-> gp-0 quad) (-> self root-override trans quad)) | ||
| (let ((t2-0 (new 'stack-no-clear 'collide-mesh-cache-tri))) |
There was a problem hiding this comment.
should be collide-tri-result
| ) | ||
| ) | ||
|
|
||
| (defbehavior robber-calc-speed robber ((arg0 float) (arg1 float) (arg2 vector) (arg3 vector) (arg4 symbol)) |
There was a problem hiding this comment.
arg2 and arg3 should be float I think
water111
requested changes
Dec 29, 2021
goal_src/levels/snow/snow-obs.gc
Outdated
| ((root-override collide-shape-moving :offset 112) | ||
| (max-frame float :offset-assert 176) | ||
| (open-sound uint128 :offset-assert 192) | ||
| (close-sound uint128 :offset-assert 208) |
There was a problem hiding this comment.
Maybe these two should be sound-name?
goal_src/levels/snow/snow-obs.gc
Outdated
| (cond | ||
| ((zero? s3-0) | ||
| (set! (-> obj open-sound) | ||
| (the-as uint128 (make-u128 (the-as uint #x6e706f2d6e6f74) (the-as uint #x7369702d776f6e73))) |
There was a problem hiding this comment.
hopefully these will become static-sound-names
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #910