Open
Conversation
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
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.
This adds 100% match ages-jp and seasons-jp builds.
What's in this?
gfx/common_jp,gfx_compressible/{ages|seasons|common}_jp,rooms/{ages|seasons}_jp,tileset_layouts/{ages|seasons}_jp, and precompressed equivalentsIt's nowhere near as scary as it looks - 1107 files changed, but 850 are .cmp, 72 are .png, 52 are .properties and 43 are .bin :)
Things to note
Makefile changes and general philosophy
I opted for higher Makefile complexity to decrease the complexity of asset organization. JP specific assets are stored in _jp folders, and are copied after the non-JP assets, overriding them. In other words, US assets are the default, and only those that need to be overwritten are copied over.
If you don't like this, let me know and I can change it!
Code changes
I've only listed a subset of the JP -> US changes here.
emptyfill macro
I added a macro to emptyfill both ages_jp and seasons_jp with data matching the bank number, so we no longer need emptyfill_0 md5s and/or the wla-dx modded build.
Rooms and tilesets
There are very few changes in these. But, for some reason they decided to change the dictionaries between JP and US. So, there are not many diffs in the .bin files, but there are many many diffs in the .cmp files.
:3
gfx
I converted all the gfx I could to png and set properties to match with the existing US ones. Let me know if I made any mistakes though!
I tested converting them all back to .bin and they all appeared to match.
spr_seasonfairy_ambi.bin - the one exception
This has to stay as a .bin - it seems the .cmp references memory outside of where it should, and somewhat ends up corrupted. The .cmp is definitely fine, as it gets put back into the ROM and continues to reference out of bounds memory, but the .bin may not be fine, and when I generate a .png from it it is definitely not fine.
I tried existing libraries and my own golang decompressor and got the same result.
Now that I think about it, if this .bin is actually corrupted, we may want to replace it with a non-corrupted version, even if it doesn't match the .cmp.
map_secret_entry_middle/flg_secret_entry_middle vs map_name_entry_middle/flg_name_entry_middle
{map|flg}_secret_entry_middle and {map|flg}_name_entry_middle are the same in JP. I don't know if we should rename or something.
Other data diffs
There's lots of other data diffs (OAM data, data_4556, palette data, etc). These are really hard to read and annoying. I don't really know how to make it nicer. If you have suggestions, let me know!
For later
Unreferenced data
There's more garbage data in JP ages - we should try to identify what it is.
Decompressing JP text
JP text only exists in compressed form right now. I haven't attempted to decompress it, and I'm unsure our current compressors/decompressors work perfectly for it. Something to follow up on, possibly when I dump the text from EU also and have the full picture.