Eduardo Quezada 98eb4e5027 Merge branch '_RHH/master' into _RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c # src/frontier_util.c # test/battle/ai/ai.c		2024-07-19 09:20:05 -04:00
..
macros	Merge branch '_RHH/master' into _RHH/upcoming	2024-07-19 09:20:05 -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