Eduardo Quezada 39ed85635f Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # include/data.h # 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_3_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_6_families.h # src/data/pokemon/species_info/gen_7_families.h # src/data/pokemon/species_info/gen_8_families.h		2024-03-17 23:41:23 -03:00
..
battle.h	Fixed config comment (#4237)	2024-03-03 09:07:47 +01:00
debug.h	ai delay timer	2023-09-12 10:35:05 +02:00
decap.h	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00
item.h	Add LGPE+ Premier Ball Bonus config (#4191)	2024-02-25 10:13:26 +01:00
level_caps.h	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00
overworld.h	Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers	2024-03-17 23:41:23 -03:00
pokemon.h	Gen 6 level up learnset update (#4267)	2024-03-11 07:46:16 -03:00
save.h	Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213)	2024-02-19 18:42:56 +01:00
species_enabled.h	Add Indigo Disk Pokemon data (#3878)	2024-01-01 01:38:50 +01:00