Decompiles z_bg_spot01_objects2.c #357
Merged
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
NEstelami
suggested changes
Aug 30, 2020
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
i82orbom
force-pushed
the
z_bg_spot01_objects2
branch
from
061214b
to
7d4c096
Compare
Roman971
requested changes
Sep 1, 2020
i82orbom
force-pushed
the
z_bg_spot01_objects2
branch
from
4c21676
to
4d33fc1
Compare
|
@Roman971 dropped the commit with the refactor to the Path stuff, if the Path refactor is required let's do it in a separate branch then |
i82orbom
force-pushed
the
z_bg_spot01_objects2
branch
from
4d33fc1
to
d282cc0
Compare
Roman971
requested changes
Sep 1, 2020
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c
Outdated
Show resolved
Hide resolved
src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h
Outdated
Show resolved
Hide resolved
| } | ||
|
|
||
| s32 func_808AC22C(Path* pathList, Vec3f* pos, s32 path, s32 waypoint) { | ||
| Vec3s* pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(((Path*)pathList + path)->points))[waypoint]; |
There was a problem hiding this comment.
Suggested change
| Vec3s* pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(((Path*)pathList + path)->points))[waypoint]; | |
| Vec3s* pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(pathList[path].points))[waypoint]; |
There was a problem hiding this comment.
Unfortunately doing it like this causes regalloc issues and a non matching function
I've changed to:
Vec3s* pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL((pathList + path)->points))[waypoint];
I've removed the cast to Path * and this matches, but accessing the path with [] breaks the function... pretty weird....
There was a problem hiding this comment.
Hmm, not very surprising but it's odd. We can go with it for now but it will probably be improved somehow later.
i82orbom
force-pushed
the
z_bg_spot01_objects2
branch
from
d282cc0
to
feee5cd
Compare
Roman971
approved these changes
Sep 1, 2020
ethteck
approved these changes
Sep 2, 2020
NEstelami
approved these changes
Sep 2, 2020
fig02
approved these changes
Sep 3, 2020
louist103
pushed a commit
to louist103/oot
that referenced
this pull request
Jan 3, 2023
* Starts z_bg_spot01_objects2 * z_bg_spot01_objects2.c almost finished * Finishes z_bg_spot01_objects2.c * Removes unused asm * PR comments and rebased to master * Addresses PR comments #2 Co-authored-by: i82orbom <i82orbom i82orbom@github> Co-authored-by: i82orbom <i82orbom@github.com>
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.
Path* path -> Path* pathList refactored as discussed in Discord in the last commit
Thanks to @ethteck for checking the jump tables at the end... actually to everyone that helps in the channel 🙇♂️