Eduardo Quezada fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # src/data/pokemon/species_info/gen_7_families.h # test/battle/ability/download.c # test/battle/ability/intimidate.c # test/battle/ability/supreme_overlord.c # test/battle/ability/zero_to_hero.c # test/battle/ai/ai.c # test/battle/move_effect/plasma_fists.c		2024-07-05 14:25:25 -04:00
..
electric.c	Enable GF type names by default	2024-04-25 18:40:38 +01:00
grassy.c	Fixes Grassy Terrain heal turn duration (#4903)	2024-07-03 22:53:15 +02:00
misty.c	Enable GF move names by default	2024-04-25 18:40:37 +01:00
psychic.c	Enable GF type names by default	2024-04-25 18:40:38 +01:00
starting_terrain.c	fix starting terrain making all other terrains infinite (#4795)	2024-06-14 09:31:21 +02:00