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

Fix: Various PAL GC asset offset issues #3052

Merged

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Jul 1, 2023

Fixes some various asset offset issues for PAL GC:

  • Circle wipe transition
  • Ganondorf's cape
  • Sun's song effect
  • Saria's song effect

Targeting Sulu as not re-generating an OTR doesn't cause any crashes.

Fixes #2994, #2993, #2992

Build Artifacts

@@ -1,21 +1,21 @@
<Root>
<File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A23D60" RangeStart="0x1218" RangeEnd="0x4118">
<Texture Name="gMantTex" OutName="mant" Format="rgba16" Width="32" Height="64" Offset="0x1218"/>
<File Name="ovl_En_Ganon_Mant" BaseAddress="0x80A0BCC0" RangeStart="0x11F8" RangeEnd="0x40F8">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confident about all the changes I made except for the BaseAddress= in these three files. I'm not sure the proper way to find them out.

Instead what I did was run ZAPD, and during the DL parsing it would throw an error saying the referenced texture address is below the base address.
In this case, the referenced texture is the first in each of these files, so I took the textures address, subtracted the offset, and used that as the BaseAddress. Obviously I tested the changes and everything works. Just want to make sure that anyone who understands it better can verify.

/cc @NEstelami

@leggettc18
Copy link
Contributor

As long as we're OK with requiring regen OTRs to fix minor graphical bugs in a bugfix release. As stated in the other PR, my opinion is that having this OTR generation bugfix in a bugfix release is fine since 1. it isn't required for the game to not crash, just fixes minor graphical bugs, and 2. It's only for 1 type of ROM, and 3. Support for said ROM was just added last release.

@briaguya-ai
Copy link
Contributor

To add to the reasoning behind version bumps. A major version bump has historically meant "old .otrs don't work." In this case, old .otrs still work (but are buggy)

@leggettc18 leggettc18 merged commit 360a97e into HarbourMasters:develop-sulu Jul 3, 2023
8 checks passed
@Archez Archez deleted the pal-gc-various-fixes branch July 3, 2023 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants