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
..
battle	Merge branch '_RHH/master' into _RHH/upcoming	2024-01-22 15:56:10 -03:00
dynamax.c	Backwards-compatible BoxPokémon Refactor (#3438)	2023-12-27 17:48:17 +01:00
fpmath.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
pokemon.c	Backwards-compatible BoxPokémon Refactor (#3438)	2023-12-27 17:48:17 +01:00
random.c	Optional high-quality RNG (#3780)	2023-12-22 17:39:15 +00:00
species.c	Backwards-compatible BoxPokémon Refactor (#3438)	2023-12-27 17:48:17 +01:00
sprite.c	Merge branch 'RHH/master' into RHH/upcoming	2023-08-12 16:31:44 -04:00
test_runner.c	Merge remote-tracking branch 'rhh/master' into upcoming	2023-12-29 19:48:21 +00:00
test_runner_args.c
test_runner_battle.c	Backwards-compatible BoxPokémon Refactor (#3438)	2023-12-27 17:48:17 +01:00