Eduardo Quezada 67f1772f1e Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_util.c # test/battle/item_effect/heal_and_cure_status.c		2024-02-09 17:02:56 -03:00
..
macros	Merge branch '_RHH/master' into _RHH/upcoming	2024-02-09 17:02:56 -03:00
macros.inc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00