Open
Conversation
Patrick12115
pushed a commit
to Patrick12115/2ship2harkinian
that referenced
this pull request
Feb 1, 2026
* brackets * more M cleanup * small cleanup * PR Review
Contributor
Author
|
I'm fairly happy with the current state of the implementation. I'd say this is ready for review. |
garrettjoecox
approved these changes
Feb 22, 2026
Contributor
garrettjoecox
left a comment
garrettjoecox
left a comment
There was a problem hiding this comment.
If we can get someone to thoroughly Q&A the changes to arrow cycling, item unequips, and the bomb arrows themselves I think this will be good to go (pending my comment about the VB)
Eblo
reviewed
Apr 3, 2026
Contributor
Eblo
left a comment
Eblo
left a comment
There was a problem hiding this comment.
Works pretty well from my testing. I like the attention to detail with honoring the lesser ammo count. There are merge conflicts to take care of, but otherwise my only feedback is a tidying up suggestion.
Comment on lines
+422
to
+428
| Color_RGB8 aButtonColor = { 0, 100, 255 }; | ||
|
|
||
| gSPVertex(POLY_OPA_DISP++, (uintptr_t)sBombCycleAButtonVtx, 4, 0); | ||
| gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, aButtonColor.r, aButtonColor.g, aButtonColor.b, pauseCtx->alpha); | ||
| gDPLoadTextureBlock(POLY_OPA_DISP++, gABtnSymbolTex, G_IM_FMT_IA, G_IM_SIZ_8b, 24, 16, 0, | ||
| G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); | ||
| gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); |
Contributor
There was a problem hiding this comment.
I feel like this much could be moved somewhere common since it's 1:1 with the trade item cycle.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
It works, but still needs work. Putting this out here for visibility. Someone slap a do not merge on this please.
TODO
Draw funcs: make the bomb appear on the arrow actor during use (currently looks like a regular arrow)Arrow cycle supportUnequip item enhancement needs to consider it a bowAdd a variant of the magic equip animation in the pause menuPrevent the bomb equip white border draw and use the bow’s insteadAdd explosion timerequipping regular bombs unequips bomb arrows, needs fixedBuild Artifacts