Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a different color when aiming at hookshotable collision #3105

Merged
merged 3 commits into from Aug 20, 2023

Conversation

louist103
Copy link
Contributor

@louist103 louist103 commented Aug 4, 2023

Resolves #2811
There are a few things I don't like. The name in the editor feels too long. Also, I had to convert the DL to a dynamic DL for the CVar and bring the VTX to C because ZAPD wouldn't extract it.

Build Artifacts

@Archez
Copy link
Contributor

Archez commented Aug 4, 2023

I had to convert the DL to a dynamic DL for the CVar and bring the VTX to C because ZAPD wouldn't extract it.

You can just add the header manually in soh/assets/soh_assets.h like

#define dobject_link_boyVtx_02CB18 "__OTR__objects/object_link_boy/object_link_boyVtx_02CB18"
static const ALIGN_ASSET(2) char object_link_boyVtx_02CB18[] = dobject_link_boyVtx_02CB18;

And then gSPVertex should properly fetch it from the resource manager

@louist103
Copy link
Contributor Author

I had to convert the DL to a dynamic DL for the CVar and bring the VTX to C because ZAPD wouldn't extract it.

You can just add the header manually in soh/assets/soh_assets.h like

#define dobject_link_boyVtx_02CB18 "__OTR__objects/object_link_boy/object_link_boyVtx_02CB18"
static const ALIGN_ASSET(2) char object_link_boyVtx_02CB18[] = dobject_link_boyVtx_02CB18;

And then gSPVertex should properly fetch it from the resource manager

Oh that would explain it. I thought it would add automatically.

Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from moving the cosmetics editor option down to equipment LGTM

Copy link
Contributor

@Archez Archez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Awesome to see mini-doc updates too 👍

@garrettjoecox garrettjoecox merged commit 155f5e1 into HarbourMasters:develop Aug 20, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Request - Visual Hookshot ability indicator (toggle option?)
4 participants