Eduardo Quezada 113f8de9b1 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_controller_player.c		2024-08-08 13:22:49 -04:00
..
battle.h	Move Relearner now displays move category (#5081)	2024-08-06 23:58:18 +02:00
debug.h
general.h	Add AUTO_LOWERCASE_KEYBOARD (#4976)	2024-07-15 19:06:01 +02:00
item.h
level_caps.h
overworld.h	FRLG+ whiteout message (#4967)	2024-08-02 08:28:05 -07:00
pokemon.h	Dynamic Move Types in Summary Screen/Battle (#5084)	2024-08-08 11:08:50 +02:00
save.h
species_enabled.h
test.h	Force species in tests (#4810)	2024-06-26 18:38:14 +02:00