Skip to content

Move black from color 15 to color 8 on 4bpp palette 1 #378

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

Merged
merged 12 commits into from
Apr 9, 2025

Conversation

blkerby
Copy link
Collaborator

@blkerby blkerby commented Apr 1, 2025

This is to support moving FX back to 2bpp palette 6, by freeing up palette 7 to be used as a map palette in the randomizer.

The only thing missing here (that I'm aware of) is a way to handle the glass tube tiles loaded in Area FX.asm.

blkerby and others added 11 commits March 30, 2025 16:36
Additional tiles copied to CRE for glass Tube and Transit Tube.
DMA bowl tiles
Bowl tiles put on the CRE tiletable.
Add the missing two vanilla Transit Tube tiles and use those instead.
Change asm to use incbin since the file path issue was fixed a while ago.
- Add new darkened tube tiles to be used in the background of the intersecting room.
- Extend the Layer2 background in MARIDIA AQUEDUCT (OuterCrateria theme). This helps the background not abruptly cut off, for randomized maps where the tube happens to pass through this room, since the randomizer has to change the vertical scroll rate to 100%.
The darker tube tiles (with the highlight removed) are used for the parts that pass through Aqueduct and Botwoon Hallway.

Also restores a couple tiles that were mistakenly deleted in the Crateria tileset, for the slope connecting the tube and the bottom of Aqueduct.
@blkerby blkerby marked this pull request as ready for review April 9, 2025 22:53
@blkerby blkerby merged commit 3626cfe into amoebaOfDoom:main Apr 9, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants