Clean up lib imported data
#2235
Merged
Conversation
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
gamezter
commented
Feb 19, 2025
| static u8 D_us_8018283C[] = {20, 1, 20, 2, 20, 3, 20, 2, 0, 0}; | ||
| static u8 D_us_80182848[] = {24, 4, 24, 5, 24, 6, 24, 5, 0, 0}; | ||
| static u8 D_us_80182854[] = {24, 7, 24, 8, 24, 9, 24, 8, 0, 0}; | ||
| static u8 D_us_80182860[] = {18, 8, 18, 9, -1, 0}; |
There was a problem hiding this comment.
notice I split D_us_80182854 in two here since 0,0 signals the end of this data
There was a problem hiding this comment.
I found a few of these when importing PSP data, since the unused symbols get stripped there, but it causes a mismatch if they're part of a data address that is actually used. Nice work
gamezter
commented
Feb 19, 2025
| #else | ||
| static u16 D_us_80181A78[] = {0x0903, 0x0A03, 0x0B03, 0x0C03, 0x0D03, 0x0E03, | ||
| 0xF03, 0x1003, 0x0000, 0x0000, 0x0003, 0x0000}; | ||
| static s32 D_us_80181A8C = 3; |
There was a problem hiding this comment.
These were actually u8[]s since they are passed to AnimateEntity with an unused s32 at the end
sozud
approved these changes
Feb 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Data seems to be aligned to a 4 byte boundary, so a lot of imported data has trailing zeros that are actually padding between data. Here I mostly remove trailing zeros from
u8[]s passed toAnimateEntitysince that function ignores everything after a-1, 0or a0, 0.I also adjusted some imported arrays so their size matches what the code expects their size to be. I had to add a
STATIC_PAD_DATA(4);but perhaps that could be a clue to adjust the file boundary.