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

Add extraction support for ByteSwapped and LittleEndian formats #3042

Merged
merged 3 commits into from Sep 10, 2023

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Jun 27, 2023

This utilizes a rom convert method to accept n64, z64, and v64 formats for extraction inside SoH and with ZAPD directly.

Depends on Kenix3/libultraship#328

TODO:

  • Support in the launch scripts for linux/mac

I've opted to do a dirty hash remap of the v64 and n64 hashes to be assigned the z64 hash equivalent. I did this because I did not want to bloat/depend on commands/tools that may or may not be available on the system, especially with the push to run the linux build on light weight systems.

Ultimately when the built-in extractor is upgraded as defined in #2987 I think we can drop the external extraction from the linux/mac scripts entirely.

Build Artifacts

@Archez
Copy link
Contributor Author

Archez commented Jun 27, 2023

Tested launch script changes on Mac and Linux (Steam Deck)

@leggettc18 leggettc18 added this to the MacReady milestone Jun 28, 2023
@garrettjoecox
Copy link
Contributor

@Archez what's the status of this, and the potentially related #3090 ?

@Archez
Copy link
Contributor Author

Archez commented Aug 30, 2023

@Archez what's the status of this, and the potentially related #3090 ?

So they effectively have the same goal (supporting all rom formats), but the problem with #3090 is that the solution is internal to Extract.cpp, meaning only Windows benefits from the change.

This PR instead solves it at the ZAPD level, and updates the mac/linux pre-launch scripts to support the other rom format hashes.

Technically, both can be accepted as is. But if we want to "advertise" that all rom formats are supported, we would need this PR at least.

The end goal should be getting the Extractor to work completely for Mac/Linux and drop the pre-launch script extraction as detailed by #2987

@garrettjoecox
Copy link
Contributor

Technically, both can be accepted as is. But if we want to "advertise" that all rom formats are supported, we would need this PR at least.

So we can probably just close #3090? Unless there are other benefits it provides?

@garrettjoecox garrettjoecox merged commit a129371 into HarbourMasters:develop Sep 10, 2023
8 checks passed
@Archez Archez deleted the rom-conversion-support branch September 10, 2023 18:17
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.

None yet

3 participants