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
..
battle.h	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-23 23:01:25 -03:00
caps.h	Merge level_caps and ev_caps into one caps file (#5429)	2024-09-27 23:40:49 +02:00
debug.h	Make Pokémon Sprite Visualizer name official (#4745)	2024-06-09 12:12:35 -04:00
dexnav.h	Rename DexNav flags and vars (#6044)	2025-01-18 14:44:40 +01:00
general.h	Adds SAVE_TYPE_ERROR_SCREEN (#5188)	2024-09-22 19:07:17 +02:00
item.h	Add more later gen fishing mechanics (#5518)	2024-10-18 16:45:31 +02:00
overworld.h	Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-26 12:08:10 -03:00
pokemon.h	IV/EV Info on Summary Screen (#6027)	2025-01-20 09:41:31 +01:00
save.h	Adjust description of FREE_MATCH_CALL (#4590)	2024-05-19 10:13:14 +02:00
species_enabled.h	Fixed silent Klefki cry (#4392)	2024-04-14 21:06:17 +02:00
summary_screen.h	IV/EV Info on Summary Screen (#6027)	2025-01-20 09:41:31 +01:00
test.h	Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)	2025-01-04 14:25:03 +01:00