Eduardo Quezada 35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ... # Conflicts: # src/data/pokemon/species_info/gen_4_families.h		2024-05-06 16:03:29 -04:00
..
battle.h	Gen 1 type matchups + cleaned type matchup table (#4508)	2024-05-06 17:37:03 +02:00
debug.h
decap.h	Pre-1.8 tweaks (#4275)	2024-03-12 12:21:03 +01:00
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	Read separate palettes and apply it to Gen 1-3	2024-04-21 10:20:23 -04:00
pokemon.h	Add unique icons for all of Arceus's forms (#4329)	2024-04-03 20:40:45 +02:00
save.h	Added FREE_EXTRA_SEEN_FLAGS to Pokedex struct (#4213)	2024-02-19 18:42:56 +01: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