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

AsparagusEduardo · 2024-08-30T00:33:12Z

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

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

Fixed light palette header offsets. Changed blending function names.

…raining

… lighting-expansion-v2

Pawkkie · 2024-09-30T19:33:52Z

Hey Edu I have a suggestion for you that I've just remembered about. A while back a user in the Discord was asking about removing / controlling the shadows from merrp's branch, I know at least removing is in scope, here.

I've actually tried to isolate these before and the solution I gave them worked for their purposes, so it might work for ours. All of the Weather_SetBlendCoeffs(8, 12); can have the 12 changed to affect how dark the shadow is. In my version I added

#define BASE_SHADOW_INTENSITY                    16 // Ranges from 0 to 16, where 0 is black and 16 is transparent

so the lines ended up as

Weather_SetBlendCoeffs(8, BASE_SHADOW_INTENSITY);

and then you can control how intense they are or disable them altogether with just the one value. I'm not sure if this has a place in our version but I wanted to share in case it's useful :)

AsparagusEduardo · 2024-09-30T19:44:09Z

Hey Edu I have a suggestion for you that I've just remembered about.

Ah, thank you very much, this will indeed be very useful :D
I would probably invert this, as 0 = turned off makes more sense to me. What's your opinion?

Pawkkie · 2024-09-30T19:45:01Z

I would probably invert this, as 0 = turned off makes more sense to me. What's your opinion?

Yeah absolutely I also did that when I was isolating it, fully in favour :D

AsparagusEduardo · 2024-10-08T15:56:06Z

All items in the description have been addressed.
Ready for review!

…dings check

Bassoonian

This is just a code review, and I'd like to do a full one again once all changes here are addressed. This doesn't test in-game behaviour. I also missed a few magic numbers I think that still need clarification.

Bassoonian · 2024-10-08T19:44:56Z

data/layouts/LavaridgeTown/map.bin

There is no reason we should be changing bin files.

data/maps/DewfordTown/map.json

data/maps/EverGrandeCity/map.json

data/maps/LavaridgeTown/map.json

data/maps/LilycoveCity/map.json

Bassoonian · 2024-10-08T20:27:49Z

src/overworld.c

+        TimeMixPalettes(1,
+                        &gPlttBufferUnfaded[OBJ_PLTT_ID(paletteNum)],
+                        &gPlttBufferFaded[OBJ_PLTT_ID(paletteNum)],
+                        (struct BlendSettings *)&gTimeOfDayBlend[currentTimeBlend.time0],
+                        (struct BlendSettings *)&gTimeOfDayBlend[currentTimeBlend.time1],
+                        currentTimeBlend.weight
+        );


Bassoonian · 2024-10-08T20:28:06Z

src/overworld.c

+           UpdateAltBgPalettes(PALETTES_BG);
+           UpdatePalettesWithTime(PALETTES_ALL);


Indentation

Bassoonian · 2024-10-08T20:29:45Z

src/rotating_gate.c

@@ -740,7 +740,7 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY)

    template.tileTag = gate->shape + ROTATING_GATE_TILE_TAG;

-    spriteId = CreateSprite(&template, 0, 0, 0x93);
+    spriteId = CreateSprite(&template, 0, 0, 0x93); // 0x93 is above shadows (0x94)


Do we need this comment?

I'd be tempted to write this as 0x94 - 1 (similar to the 0x94 + 1 above)... Except I agree with your comment elsewhere about magic numbers. If we had #define OW_SHADOW_SUBPRIORITY 0x94 or whatever, then it's OW_SHADOW_SUBPRIORITY - 1 which maybe doesn't need the comment? Lower (sub)priority = above is consistent across the codebase.

EDIT: Actually I think 0x94 might be the priority of object events based on a comment earlier in the PR (I've added a comment there too).

Bassoonian · 2024-10-08T20:30:21Z

src/trainer_see.c

+// TODO: Move these declarations into even_object_movement.h
+#define OBJ_EVENT_PAL_TAG_MAY 0x1110
+#define OBJ_EVENT_PAL_TAG_EMOTES 0x8003


A TODO that needs to be addressed

Bassoonian · 2024-10-08T20:30:36Z

src/tv.c

+        }
+        else if (show->threeCheers.sheen > 22)


As above, for pret or another PR

aarant added 30 commits April 25, 2021 16:26

OW windows now light up at night.

5045958

Allowed map headers to specify light palettes.

1277493

Changed Route 104 windows palette.

73234e0

Updated Petalburg tileset lights.

3a7c2e3

Added Slateport light palettes.

2055a56

Added default light blending color.

56b9764

Fixed light palette header offsets. Changed blending function names.

Added Mauville light palettes.

4a04282

Added Fortree/weather institute lights.

b7d9b77

Added Lilycove light palettes.

806b4ac

Fixed TOD & weather fadeout.

6806898

Refactored light metatile caching.

cd9276c

Added more Lilycove window lights.

1ebf94a

Added Dewford window lights.

787e196

Added Fallarbor window lights.

5e3fcaa

Added Mossdeep window lights.

dbd86a3

Added Sootopolis lights.

898a09f

Added Pacifidlog window lights.

2f488d6

Experimental TOD tint.

3c52e9b

Added weighted palette average.

e11d050

Fixed bug in MapHasNaturalLight for ocean routes.

3bd46b5

Added inter-time-of-day blending.

22c429d

Testing evening tint.

def9d39

Fixed bugged interaction between reflections & light sprites.

a80de91

Slight palette update optimization.

0d8467c

Testing combined averaging function.

93ab445

Averaging function can now tint.

ae4f596

Added glowing colors for some follower pokemon (Ampharos).

73d060b

Optimized time-of-day & native palette blending.

da345c1

Fixed palette fades during intermediate times of day.

4bb7abb

Fixed bug in TOD blending.

96d0f7e

aarant and others added 8 commits June 25, 2024 01:38

fix: MSG_COND_TIME_OF_DAY now checks whether map is outdoors and not …

e899218

…raining

fix: Uninitialized value used in LightenSpritePaletteInFog

0745eaf

meta: cleaned up spacing of lighting code

0ae5cb1

meta: ignored refactoring change

ca75542

Merge branch 'followers' into lighting

29b2a75

Merge branch 'lighting' of https://github.com/aarant/pokeemerald into…

ad969c9

… lighting-expansion-v2

Fix up some auto merge stuff

fc3a700

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

396a390

AsparagusEduardo marked this pull request as draft August 30, 2024 00:33

AsparagusEduardo added 2 commits August 29, 2024 20:38

Removed unused fields

d80bf06

Code style adjustments

aa6d540

AsparagusEduardo added new-feature Adds a feature category: overworld Pertains to out-of-battle mechanics labels Aug 30, 2024

AsparagusEduardo added 7 commits September 11, 2024 08:09

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

fc1212b

DNS tinting uses fake RTC's rate

fb360b1

Secondary map popup window updates time while active

757ed70

Using TIME instead of TIME_OF_DAY

56859e3

Form changes and evolutions happen based on fake RTC

53414cb

Time blending uses OW_TIMES_OF_DAY

18485ca

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

d1056f8

Add config for shadow intensity

f913f28

AsparagusEduardo marked this pull request as ready for review October 8, 2024 15:55

AsparagusEduardo added 2 commits October 8, 2024 15:58

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2

1d95578

Fixed missing call to UpdateTimeOfDay in GetTimeOfDay for inside buil…

e68cdfe

…dings check

Bassoonian reviewed Oct 8, 2024

View reviewed changes

Bassoonian added this to the 1.11 milestone Oct 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

AsparagusEduardo commented Aug 30, 2024 •

edited

Loading

Pawkkie commented Sep 30, 2024 •

edited

Loading

AsparagusEduardo commented Sep 30, 2024

Pawkkie commented Sep 30, 2024

AsparagusEduardo commented Oct 8, 2024

Bassoonian left a comment

Bassoonian Oct 8, 2024

Bassoonian Oct 8, 2024

Bassoonian Oct 8, 2024

Bassoonian Oct 8, 2024

mrgriffin Oct 9, 2024 •

edited

Loading

Bassoonian Oct 8, 2024

Bassoonian Oct 8, 2024

		UpdateAltBgPalettes(PALETTES_BG);
		UpdatePalettesWithTime(PALETTES_ALL);

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

Are you sure you want to change the base?

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

Conversation

AsparagusEduardo commented Aug 30, 2024 • edited Loading

Description

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

Changes from the base branch:

Images

People who collaborated with me in this PR

Discord contact info

Pawkkie commented Sep 30, 2024 • edited Loading

AsparagusEduardo commented Sep 30, 2024

Pawkkie commented Sep 30, 2024

AsparagusEduardo commented Oct 8, 2024

Bassoonian left a comment

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

mrgriffin Oct 9, 2024 • edited Loading

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

Bassoonian Oct 8, 2024

Choose a reason for hiding this comment

AsparagusEduardo commented Aug 30, 2024 •

edited

Loading

Pawkkie commented Sep 30, 2024 •

edited

Loading

mrgriffin Oct 9, 2024 •

edited

Loading