Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Community PR] Integrate merrp's lighting branch #5288

Open
wants to merge 186 commits into
base: upcoming
Choose a base branch
from
Open

[Community PR] Integrate merrp's lighting branch #5288

wants to merge 186 commits into from

Conversation

AsparagusEduardo
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo commented Aug 30, 2024 •
edited
Loading

Description

This PR integrates ntegrating #aarant's lighting-expanded-id branch.

Do NOT squash, as preserving history will help minimize merge conflicts for users that already merged the feature

Changes from the base branch:

  • Changed the BW Map Popup to update its time while active.
    • I did this first to have a way of debugging overworld exterior tinting over the day by locally forcing the Popup to not disappear.
  • Use Expansion's Fake RTC.
    • Changed tinting refresh rate to change alongside Fake RTC.
  • Use Expansion's constants (TIME_NIGHT instead of TIME_OF_DAY_NIGHT).
    • This allows for different tinting for Morning vs Evening.
  • Use Expansion's OW_TIMES_OF_DAYconfig (which allows users to set their own times by generation).
  • Option to enable lamp light "wobbling" (disabled by default), as it can be nausiating for some players. Fix Blinking Lights in Rustboro aarant/pokeemerald#41 will handle it instead.
  • Disable object event shadows

Images

mGBA_cdHELxiZt6

People who collaborated with me in this PR

  • @aarant for the original implementation and feature branch,
  • @Greenphx9 for their help merging to current expansion.

Discord contact info

AsparagusEduardo

aarant added 30 commits April 25, 2021 16:26
@aarant
OW windows now light up at night.
5045958
@aarant
Allowed map headers to specify light palettes.
1277493
@aarant
Changed Route 104 windows palette.
73234e0
@aarant
Updated Petalburg tileset lights.
3a7c2e3
@aarant
Added Slateport light palettes.
2055a56
@aarant
Added default light blending color.
56b9764 
Fixed light palette header offsets.
Changed blending function names.
@aarant
Added Mauville light palettes.
4a04282
@aarant
Added Fortree/weather institute lights.
b7d9b77
@aarant
Added Lilycove light palettes.
806b4ac
@aarant
Fixed TOD & weather fadeout.
6806898
@aarant
Refactored light metatile caching.
cd9276c
@aarant
Added more Lilycove window lights.
1ebf94a
@aarant
Added Dewford window lights.
787e196
@aarant
Added Fallarbor window lights.
5e3fcaa
@aarant
Added Mossdeep window lights.
dbd86a3
@aarant
Added Sootopolis lights.
898a09f
@aarant
Added Pacifidlog window lights.
2f488d6
@aarant
Experimental TOD tint.
3c52e9b
@aarant
Added weighted palette average.
e11d050
@aarant
Fixed bug in MapHasNaturalLight for ocean routes.
3bd46b5
@aarant
Added inter-time-of-day blending.
22c429d
@aarant
Testing evening tint.
def9d39
@aarant
Fixed bugged interaction between reflections & light sprites.
a80de91
@aarant
Slight palette update optimization.
0d8467c
@aarant
Testing combined averaging function.
93ab445
@aarant
Averaging function can now tint.
ae4f596
@aarant
Added glowing colors for some follower pokemon (Ampharos).
73d060b
@aarant
Optimized time-of-day & native palette blending.
da345c1
@aarant
Fixed palette fades during intermediate times of day.
4bb7abb
@aarant
Fixed bug in TOD blending.
96d0f7e
@Bassoonian Bassoonian added this to the 1.11 milestone Oct 18, 2024
@AsparagusEduardo
Copy link
Collaborator Author

I'll be commenting as I apply changes locally

AsparagusEduardo
AsparagusEduardo commented Dec 5, 2024
View reviewed changes
Copy link
Collaborator Author

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed some review changes for now.

src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather_effect.c Show resolved Hide resolved
@pkmnsnfrn pkmnsnfrn added the type: big feature A feature with big diffs and / or high impact / subjectivity / pervasiveness label Dec 20, 2024
@AsparagusEduardo AsparagusEduardo force-pushed the _RHH/pr/upcoming/lighting-expansion-v2 branch from c8cfd7d to dbc3cc2 Compare December 21, 2024 12:31
@AsparagusEduardo AsparagusEduardo force-pushed the _RHH/pr/upcoming/lighting-expansion-v2 branch from 9903fa5 to a5b079d Compare December 21, 2024 14:00
@AsparagusEduardo
Copy link
Collaborator Author

Finally, finally ready for re-review!

@Bassoonian Bassoonian self-assigned this Jan 13, 2025
@Pawkkie Pawkkie removed this from the 1.11 milestone Jan 13, 2025
Bassoonian
Bassoonian requested changes Jan 17, 2025
View reviewed changes
Copy link
Collaborator

@Bassoonian Bassoonian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review número dos

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc Show resolved Hide resolved
data/maps/MtPyre_Summit/scripts.inc Outdated Show resolved Hide resolved
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc Show resolved Hide resolved
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc Outdated Show resolved Hide resolved
docs/tutorials/dns.md Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's nice that we're getting a tutorial, but I would personally not consider this tutorial blocking for this PR (though it can be for the release) so we can get as much playtesting out of it as possible

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a way of addressing the comments in the code that addressed reading the readme, so instead of removing the reference, I ported the content to a doc file.

Copy link
Collaborator

@Bassoonian Bassoonian Jan 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Definitely fine by me, but we should probably expand upon it then and open an issue for this when the PR gets merged :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

src/palette_util.c Outdated Show resolved Hide resolved
src/pokemon_summary_screen.c Outdated Show resolved Hide resolved
src/sprite.c Show resolved Hide resolved
src/util.c Outdated Show resolved Hide resolved
tools/gbagfx/jasc_pal.c Outdated Show resolved Hide resolved
AsparagusEduardo
AsparagusEduardo commented Jan 17, 2025
View reviewed changes
Copy link
Collaborator Author

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a a bunch of local changes at once instead of one at a time to avoid spam lol

src/data/object_events/object_event_graphics_info_pointers.h Show resolved Hide resolved
src/field_effect_helpers.c Show resolved Hide resolved
src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather.c Outdated Show resolved Hide resolved
src/field_weather_effect.c Outdated Show resolved Hide resolved
src/overworld.c Outdated Show resolved Hide resolved
src/pokemon_summary_screen.c Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Bassoonian Bassoonian Bassoonian requested changes

@mrgriffin mrgriffin mrgriffin left review comments

Requested changes must be addressed to merge this pull request.

Assignees

@Bassoonian Bassoonian

Labels
category: overworld Pertains to out-of-battle mechanics new-feature Adds a feature type: big feature A feature with big diffs and / or high impact / subjectivity / pervasiveness
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@AsparagusEduardo @Pawkkie @mrgriffin @Bassoonian @pkmnsnfrn @aarant @Greenphx9