Eduardo Quezada 00e2ca6030 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_ai_util.c # src/battle_script_commands.c # src/battle_tv.c # src/data/battle_moves.h # src/data/pokemon/species_info/gen_9.h		2024-01-22 15:56:10 -03:00
..
icon_palettes	Merge branch '_RHH/master' into _RHH/upcoming	2024-01-22 15:56:10 -03:00
icons	Merge branch '_RHH/master' into _RHH/upcoming	2024-01-22 15:56:10 -03:00