Fix: Missing TextIDs for MQ PAL and change lava size#3449
Merged
aMannus merged 2 commits intoHarbourMasters:develop-macreadyfrom Nov 28, 2023
Merged
Fix: Missing TextIDs for MQ PAL and change lava size#3449aMannus merged 2 commits intoHarbourMasters:develop-macreadyfrom
aMannus merged 2 commits intoHarbourMasters:develop-macreadyfrom
Conversation
briaguya0
approved these changes
Nov 26, 2023
aMannus
approved these changes
Nov 27, 2023
garrettjoecox
approved these changes
Nov 28, 2023
A-Green-Spoon
pushed a commit
to A-Green-Spoon/Shipwright
that referenced
this pull request
Nov 30, 2023
…3449) * Fix text offset for MQ pal and add text ID asserts * correct lava texture size
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
4 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.
MQ PAL had bad offsets for the messages making it not have the first 4 messages which are Adult trade GI messages and would crash. This address the offsets and adds some debug asserts to help catch when the first text ID is not found.
This also adds a little cleanup and tweaks to the recent KD lava changes. The main change is that one of the lava textures seemingly is "too large" from decomp. It has a size of 64x64 where as all other lava textures are 32x64. The original game code that operates on this lava texture only ever reads the first 2048 pixel values (which is 32x64). Looking at the png output of the 64x64 reveals that the data should have been more like 32x128, and the first half of the data matches the second half.
For texture pack makers, this texture really should just be 32x64 so they can make the "correct" looking texture image before packing.
The relevant part that shows only the first 2048 pixel values are read from the lava texture, where
temp_s1issLavaFloorLavaTexShipwright/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
Lines 219 to 224 in 3cf9d65
There is also an offset fix for the lava textures on NMQ PAL where it was off by a few pixels.
Build Artifacts