Cherry pick from upstream#1274
Merged
balloondude2 merged 260 commits intoHarbourMasters:developfrom Oct 13, 2025
Merged
Conversation
…sters#1480) * Move player function declarations to z64player.h * rename Actor_MountHorse to Player_MountHorse and similar functions * whoops * add missing includes * format * whoops
* anim P cleanup * PR Review * PR Review * Postbox Idle
* lights.c * z64skin_matrix.h * Move out some stuff from macros.h * gamealloc.h * move most transition functions to z64transition.h * z64lib.h * `include` cleanup on transition files * z_overlay cleanup * z64malloc.h * format * forgot to remove those * forgot this * fix borken includes
* Update icon_item_static.xml offsets * Switched names for item_icon xml file * Switched lines for icon_item_static.xml
* anim O cleanup * fix bss * PR Review
* Init, Destroy, Update, easy actions * Just the hard 3 + 1 left * One left * OK Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> * Data/bss in, extract colheader * Clean up externs * Better match for func_809EECBC * Sfx * Lot of naming * fix build * Name skel stuff * name limbdraws * name colliders * Document `object_boss05` * Port some names from Odolwa * Name bio baba types (and relatedly clean up EnPp) * Better names for the LimbDraw functions + some related vars * Name all functions * Name a lot of struct vars * Colliders and body parts * Name all struct vars (might come back for a few of these though) * Name most stack vars * Fragment states, ice data * Limb rot index * Damage effects * Enum for hit reactions * Enums for movement state/attack state * Finish up * Missed this in EnPp * Respond to reviews * Fix comment * Reverse order for postlimbdraw, etc. functions * Remove blank line at the top * Respond to review * Make a "getter" macro for the force detach timer * Respond to review --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: angie <angheloalf95@gmail.com>
* reverb.h * move variable * needs the size
* begin docs * more docs * skybox * more cleanup * more cleanup * more cleanup * Improve comment * in-function static
…ourMasters#1488) * make segments for the systemheap and the framebuffers * define in the makefile * undefined syms * Make segments for the pre boot buffers too * Update spec Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> * review * Update spec Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> * Update Makefile Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * comments * comment * move comment about the hardcoded address to buffers.h * rewrite SYSTEM_HEAP_END_ADDR in terms of other symbols * Use `ALIGNED` on all the buffers * Rename SYSTEM_HEAP_END_ADDR to FRAMEBUFFERS_START_ADDR * Put ALIGNED at the right like the rest of the codebase * merge * gLoBuffer * gHiBuffer * Add a static assert to ensure the address of gHiBuffer haven't shifted without the user noticing * smol include cleanup --------- Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Move qrand to libc64 * use an union to avoid type punning * __osMalloc * math64.c * fixed_point.h * sleep * aprintf.h * sprintf * malloc * use original names on aprintf.c and malloc.c * qrand cleanup pass * use original names of sleep.c * og names for sprintf * more cleanup * format * fixes * whoops * use ARRAY_COUNT again * comment * Use `fu` * forgot this one * review * fix * sneak a tiny cleanup
* use CURRENT_TIME macro * add comment * cleanup brackets
* Actor Category Change * cleanup * comments * adj comment * revert small cleanup for libc64 PR * adjust comments
* Actor Category Change * cleanup * comments * adj comment * revert small cleanup for libc64 PR * adjust comments
* copy over docs * more docs * some docs * more docs * small cleanup * more small cleanup * more small cleanup * lerp time * small reordering * feather type * general owl warp docs * more cleanup * rm redundant info * PR Review * PR Review
* anim P cleanup * PR Review * PR Review * Postbox Idle
* begin anim R * sTexturesDesegmented * more misc docs * more misc cleanup * small adjustments * oh sneaky * PR Review * adj comment, reads better * missed an enum * this one actor reverses true/false * bool * CARNIVOROUS_LILY
This reverts commit e47a705.
* split * bss * z64eff_ss_dead.h * clean eff_blure * eff_shield_particle cleanup * tire?mark * and more cleanup * format * forgot to remove this * review * EffectBlureDrawMode enum * review * review * bss
…rbourMasters#1519) * Add original asset names to all `object_p*` and `object_r*` files * Respond to review
* begin R * finish anim R * cleanup * small adj * cleanup * CS_STATE_IDLE * CS_ID_NONE * more cleanup * sBssPad * angles * sneak in small fix * small fix
* Document inconsistent empty C-button disabling bug * Fixed formatting
* EnAn MsgScriptCallback * Version check * Write .extracted-assets.json to outputDir * Fix m2ctx * Fix boot_functions.csv
* player face docs * more docs * cleanup * toto * more comments * fix bss, names * better comment * PR, fix comment * fix bss * sEyeTextures comment * FaceChange_UpdateBlinkingNonHuman --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Contributor
I do think this would best be handled in a followup PR. Off the top of my head, this includes the Keaton and Mayor check. And potentially any that are using a bomber notebook flag. |
balloondude2
reviewed
Oct 5, 2025
Contributor
balloondude2
left a comment
balloondude2
left a comment
There was a problem hiding this comment.
Some initial feedback as I'm going through.
mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipBombBagTheftCutscene.cpp
Outdated
Show resolved
Hide resolved
Comment on lines
16
to
+18
| // The actor sets this flag using direct syntax, which does not trigger rando's FLAG_WEEK_EVENT_REG handling | ||
| SET_WEEKEVENTREG(WEEKEVENTREG_79_80); | ||
| ((EnKitan*)actor)->actionFunc = func_80C09518; | ||
| // TODO: No longer true with decomp updates. Try removing this and see what happens. | ||
| SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KEATON_HEART_PIECE); |
Contributor
There was a problem hiding this comment.
Already on the followup todos, but likely do not need to directly SET_WEEKEVENTREG here anymore
balloondude2
reviewed
Oct 8, 2025
balloondude2
approved these changes
Oct 12, 2025
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
20 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.
The main goal of this is to get documentation up to date. Some headers and asset XML has changed too along with documentation commits, but I did my best to keep things in line. This brings us up to date with
3b3b117on decomp, but not including because I skipped decomp-specific commits like that one.TODO (for this PR):
TODO (followup):
Supersedes #1135
Cherry picked commits (PRs refer to decomp, not 2ship)
Details
Skipped commits (PRs refer to decomp, not 2ship)
Details
Build Artifacts