Commit Graph

65 Commits

Author SHA1 Message Date
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +01:00
Bassoonian
2394195123
Remove non-existent functions from header files (#6825) 2025-05-13 10:52:45 +02:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +02:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
11bdbfb658 Fix compile issues 2025-01-26 16:35:05 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
2025-01-26 12:08:10 -03:00
Eduardo Quezada
c363c28b22 Addressing a bunch of small things 2025-01-17 18:21:48 -03:00
Ariel A
4047f9b764 feat: added FadeScreenHardware utility 2025-01-01 00:37:35 -05:00
Ariel A
faf773a54b feat: added time-blend override 2025-01-01 00:37:21 -05:00
Eduardo Quezada
1e6628b78d Address Review comments Pt2 2024-12-21 10:49:59 -03:00
Eduardo Quezada
458bd5ad4d Review changes pt 1 2024-12-05 07:56:49 -03:00
Greenphx9
ad969c968c Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2 2024-08-25 17:54:28 +10:00
Ariel A
0745eaf2e0 fix: Uninitialized value used in LightenSpritePaletteInFog 2024-08-12 22:42:31 -04:00
DizzyEggg
9ac8d0de25
Optimize/get rid of unused palette vars/functions (#4841) 2024-08-04 21:41:55 -04:00
Ariel A
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -04:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
Ariel A
3a86c8bd4c Merge branch 'followers' into lighting 2022-10-07 21:08:06 -04:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
Martin Griffin
5719a7f7bc Use static inline instead of extern inline for modern 2022-08-19 15:47:50 +01:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Ariel A
bc2b50cd2e Added LoadPaletteFast function. 2022-04-18 00:23:15 -04:00
Ariel A
6e621d80a1 Added day/night palette swapping.
Updated lighting for lava, Petalburg, Slateport, Dewford, Verdanturf, Oldale, Mossdeep, Lilycove, Fallarbor.
Improved lantern appearance & added neon signs on PokeCenter & Mart.
Optimized gamma shift code.
Removed obselete CacheLightMetatiles.
2022-04-18 00:23:11 -04:00
Ariel A
5e3c48acfc Fixed bug where lighting branch wouldn't build on modern. Credit: Jaizu 2022-01-16 17:12:13 -05:00
Ariel A
11c7eee285 Restored lighting & shadows code removed from follower branch. 2021-12-22 23:20:11 -05:00
Ariel A
e1c56d76ac Merge branch 'romhack-no-lighting' into lighting 2021-12-22 23:08:32 -05:00
Ariel A
26c38e8093 Removed lighting/day-night/shadow code from follower branch. 2021-12-22 22:58:52 -05:00
Ariel A
9de9442c39 Merge branch 'romhack' into lighting 2021-12-18 17:25:56 -05:00
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
GriffinR
f51247615e Finish documenting battle_transition 2021-10-29 18:32:53 -04:00
Ariel Antonitis
b64eb7ea14 Modified palette tint behavior. 2021-09-01 00:12:14 -04:00
Ariel Antonitis
65e616342b Changed time blending to work with FadeScreen. 2021-05-02 02:53:30 -04:00
Ariel Antonitis
0cc6c7b111 Made BlendPalettesFine global. 2021-04-25 22:01:33 -04:00
Ariel Antonitis
4454a6397b Fixed bug where TOD was updated too frequently. 2021-04-25 22:01:33 -04:00
Ariel Antonitis
dbc4cb8293 Refactored BlendSettings storage inside gPaletteFade. 2021-04-25 16:26:24 -04:00
Ariel Antonitis
4bb7abb520 Fixed palette fades during intermediate times of day. 2021-04-25 16:26:23 -04:00
Ariel Antonitis
da345c1eeb Optimized time-of-day & native palette blending. 2021-04-25 16:26:23 -04:00
Ariel Antonitis
ae4f596885 Averaging function can now tint. 2021-04-25 16:26:23 -04:00
Ariel Antonitis
93ab4451fc Testing combined averaging function. 2021-04-25 16:26:23 -04:00
Ariel Antonitis
def9d39fbb Testing evening tint. 2021-04-25 16:26:22 -04:00
Ariel Antonitis
22c429d0d6 Added inter-time-of-day blending. 2021-04-25 16:26:22 -04:00
Ariel Antonitis
e11d050423 Added weighted palette average. 2021-04-25 16:26:22 -04:00
Ariel Antonitis
3c52e9b7ca Experimental TOD tint. 2021-04-25 16:26:22 -04:00
Ariel Antonitis
56b9764aec Added default light blending color.
Fixed light palette header offsets.
Changed blending function names.
2021-04-25 16:26:22 -04:00
Ariel Antonitis
127749369d Allowed map headers to specify light palettes. 2021-04-25 16:26:21 -04:00