-
Notifications
You must be signed in to change notification settings - Fork 466
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
leggettc18
merged 1 commit into
HarbourMasters:develop-sulu
from
Archez:pal-gc-various-fixes
Jul 3, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| <Root> | ||
| <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xE90E0" RangeEnd="0x12CBB0"> | ||
| <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xE90E0"/> | ||
| <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xE94E0"/> | ||
| <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xE98E0"/> | ||
| <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xE9CE0"/> | ||
| <Array Name="sCircleWipeVtx" Count="34" Offset="0xEA0E0"> | ||
| <File Name="code" OutName="z_fbdemo_circle" RangeStart="0xE90C8" RangeEnd="0x106F10"> | ||
| <Texture Name="sTransCircleNormalTex" Format="i8" Width="16" Height="64" Offset="0xE90C8"/> | ||
| <Texture Name="sTransCircleWaveTex" Format="i8" Width="16" Height="64" Offset="0xE94C8"/> | ||
| <Texture Name="sTransCircleRippleTex" Format="i8" Width="16" Height="64" Offset="0xE98C8"/> | ||
| <Texture Name="sTransCircleStarburstTex" Format="i8" Width="16" Height="64" Offset="0xE9CC8"/> | ||
| <Array Name="sCircleWipeVtx" Count="34" Offset="0xEA0C8"> | ||
| <Vtx/> | ||
| </Array> | ||
| <!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`--> | ||
| <!--<DList Name="sCircleWipeDL" Offset="0x10FF68"/>--> | ||
| <DList Name="sCircleDList" Offset="0xEA2E0"/> | ||
| <DList Name="sCircleDList" Offset="0xEA2C8"/> | ||
| </File> | ||
| </Root> |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <Root> | ||
| <File Name="ovl_Oceff_Spot" BaseAddress="0x80BA6070" RangeStart="0x7F0" RangeEnd="0xEC8"> | ||
| <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x7F0"/> | ||
| <Array Name="sCylinderVtx" Count="27" Offset="0xBF0"> | ||
| <File Name="ovl_Oceff_Spot" BaseAddress="0x80B7CDC0" RangeStart="0x780" RangeEnd="0xE58"> | ||
| <Texture Name="sTex" OutName="sun_song_effect" Format="i8" Width="32" Height="32" Offset="0x780"/> | ||
| <Array Name="sCylinderVtx" Count="27" Offset="0xB80"> | ||
| <Vtx/> | ||
| </Array> | ||
| <DList Name="sCylinderMaterialDL" Offset="0xDA0"/> | ||
| <DList Name="sCylinderModelDL" Offset="0xE38"/> | ||
| <DList Name="sCylinderMaterialDL" Offset="0xD30"/> | ||
| <DList Name="sCylinderModelDL" Offset="0xDC8"/> | ||
| </File> | ||
| </Root> |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <Root> | ||
| <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80BAB3F0" RangeStart="0x480" RangeEnd="0x16C8"> | ||
| <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x480"/> | ||
| <Array Name="sFrustumVtx" Count="22" Offset="0x1480"> | ||
| <File Name="ovl_Oceff_Wipe3" BaseAddress="0x80B81D90" RangeStart="0x430" RangeEnd="0x1678"> | ||
| <Texture Name="sTex" OutName="saria_song_effect" Format="i8" Width="64" Height="64" Offset="0x430"/> | ||
| <Array Name="sFrustumVtx" Count="22" Offset="0x1430"> | ||
| <Vtx/> | ||
| </Array> | ||
| <DList Name="sMaterialDL" Offset="0x15E0"/> | ||
| <DList Name="sFrustumDL" Offset="0x1668"/> | ||
| <DList Name="sMaterialDL" Offset="0x1590"/> | ||
| <DList Name="sFrustumDL" Offset="0x1618"/> | ||
| </File> | ||
| </Root> |
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.
There was a problem hiding this comment.
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