Eduardo Quezada 80b193280d Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # src/battle_main.c # src/data/item_icon_table.h # src/data/pokemon/species_info/gen_9_families.h		2024-05-27 10:13:42 -04:00
..
macros	Merge branch '_RHH/master' into _RHH/upcoming	2024-05-27 10:13:42 -04: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