Skip to content

NTSC Support (N64)#4198

Merged
Archez merged 84 commits intoHarbourMasters:developfrom
inspectredc:NTSC
Mar 30, 2025
Merged

NTSC Support (N64)#4198
Archez merged 84 commits intoHarbourMasters:developfrom
inspectredc:NTSC

Conversation

@inspectredc
Copy link
Member

@inspectredc inspectredc commented May 31, 2024

Supports all N64 NTSC Versions

A few small todos that dont need to be addressed in this PR, mostly being translations or tts related.

Build Artifacts

@inspectredc
Copy link
Member Author

inspectredc commented May 31, 2024

@aMannus aMannus added this to the 9.0.0 milestone Mar 23, 2025
@leggettc18
Copy link
Contributor

I did a quick sanity check on this, mostly seems to work great! One issue I found is that if you have a PAL and NTSC OTR loaded and change from a PAL Language to an NTSC language on the options screen, the game will crash. Everywhere else it seems to be fine.

@inspectredc
Copy link
Member Author

I did a quick sanity check on this, mostly seems to work great! One issue I found is that if you have a PAL and NTSC OTR loaded and change from a PAL Language to an NTSC language on the options screen, the game will crash. Everywhere else it seems to be fine.

Oh awesome, thanks! Good to know about options screen, don't think I would have thought to test there, will get a fix for that as soon as i can!

@leggettc18
Copy link
Contributor

leggettc18 commented Mar 24, 2025

Nice! Just as a heads up as well, PR #5198 includes a way to load Vanilla messages into a CustomMessage in CustomMessageManager.cpp, so if that gets merged first you may need to make some edits in there for that to work properly with NTSC. Sorry in advance if that causes any headaches, I'm willing to help out if there's anything I can do there. Currently the only place that gets used is Skulltula Tokens with No Skulltula Freeze on so it's niche for the moment.

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.

I appreciate the various cleanups you did in some spots!

Haven't played it yet to see how it all works, but for the most part the code looks good and not as intrusive as I thought it would have been.

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.

Approving the current changes as they are. Merge ready pending the ZAPD submodule update to point to upstream.

@Archez
Copy link
Contributor

Archez commented Mar 30, 2025

Worth commenting for traceability, but this PR does include a couple extra things beyond NTSC support:

  • Renaming some timer fields on the save context to match decomp, and an HUD alpha field.
  • Refactoring of the BetterOwl prompt choice enhancement to no longer modify in-place the text data itself, and reducing its footprint in the source.

@Archez Archez merged commit 6140b2e into HarbourMasters:develop Mar 30, 2025
5 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.

8 participants