Eduardo Quezada 021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h		2024-05-28 14:28:33 -04:00
..
battle.h	Add configuration to prevent permanent item theft (Covet / Thief) from NPCs (#4605)	2024-05-20 22:52:12 +02:00
debug.h
item.h	Enable GF item names by default	2024-04-25 18:40:37 +01:00
level_caps.h	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00
overworld.h	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-05-16 17:31:46 -04:00
pokemon.h	Add egg cycle length config (#4596)	2024-05-18 14:59:32 -04: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
test.h	Enable GF type names by default	2024-04-25 18:40:38 +01:00