Eduardo Quezada 80b193280d Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_main.c # src/data/item_icon_table.h # src/data/pokemon/species_info/gen_9_families.h		2024-05-27 10:13:42 -04:00
..
electric.c	Enable GF type names by default	2024-04-25 18:40:38 +01:00
grassy.c	AI respects partner when using spread moves in double battles (#4518)	2024-05-17 00:41:55 +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