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
..
2018-01-06 21:38:34 -05:00