Periodic cherry-pick from upstream#1504
Open
Eblo wants to merge 21 commits intoHarbourMasters:developfrom
Open
Periodic cherry-pick from upstream#1504Eblo wants to merge 21 commits intoHarbourMasters:developfrom
Eblo wants to merge 21 commits intoHarbourMasters:developfrom
Conversation
* Freezard: some docs * Freezard: more docs * Freezard: most function names * Freezard: last function named * Freeza: more docs * Freezard: oops wrong actor name * Fz: more docs * Fz: more docs * Fz: Object named * Fz: Object named * Fz: changed my mind, function names changed to reflect old OOT behavior not seen in this game, in case someone confuses them * Freezer: docs * Free: more docs * F: format * Fz: more docs * Fz: format * EnFz: more docs, format * Fz: More minor docs * Fz: more docs, format * Apply suggestions from code review Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * EnFz: More requested changes * Fz: updated function declarations * EnFz: one of the flags was still 0 * Fz: updated functions.txt for disasm * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Document `func_801514B0` * Add transformation enum reference * Rename to ShowDescription * Format
* PoComposer: some docs * PoComposer: the rest of the object documented * PoComposer: docs tweaked * PoComposer: missing weekevent reg in a schedule file wasnt found by rename script * PoComposer: document tweaks * PoComposer: forgot the texture name
* Document `func_80148CBC` * Add doc comment
…ables (#1835) * Document `D_801CFC78`, `func_80150A84` and textbox types * Format * Textbox background enum * More enum usages * Rename D_801D03A8 * Fix value of TEXTBOX_BG_NONE * Convert background type enum to macros * Restore enum, fix BSS ordering * Rename to SetTextboxColor * More BSS fixing
* Dnk: some docs * Dnk: more docs * Dnk: format * Dnk: More docs * Dnk: more docs * Dnk: more docs * Dnk: specify variants * Pr2: requested changes
* Rename multiple variables in `MessageContext` * Fix errors * Better rename for price fields * Rename two more fields related to number inputs * More renames for text line positioning fields * Fix copy-paste error
* Document `func_808B849C` * Clarify doc about number returned Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Add number comparisons * Try arithmetic in remains function * Reverse addition operation - will it break matching? --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Name static arrays for SoDT skip message IDs * Rename two more static variables * Convert hex drop thresholds to decimal * Rename to text IDs
* Document `EnMaruta` * Document type from params * Rename display lists properly * Format * Add ASCII picture to explain DL array * Use boolean values for isRetracting * Shorten name of zero vector * Rename to gPracticeLogWholeDL Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Forgot to rename the other reference * Rename to SetupRiseThroughFloor * Add comments marking "on floor setup" as theory-only --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Comment on lines
+72
to
+73
| #define dgPoeComposerArmTex "__OTR__objects/object_po_composer/gPoeComposerArmTex" | ||
| static const ALIGN_ASSET(2) char gPoeComposerArmTex[] = dgPoeComposerArmTex; |
Contributor
There was a problem hiding this comment.
Will these break existing texture packs?
Patrick12115
pushed a commit
to Patrick12115/2ship2harkinian
that referenced
this pull request
Feb 1, 2026
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
5 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.
DO NOT SQUASH
This brings us up to date with 0877ce4
Build Artifacts