Eduardo Quezada 941e32a14f Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_main.c # test/battle/move_effect/body_press.c		2024-06-01 19:55:53 -04:00
..
electric.c	Enable GF type names by default	2024-04-25 18:40:38 +01:00
grassy.c	Added missing Move Effect TODO tests - Volume B (#4682)	2024-06-01 15:07:51 +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