Hedara da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge ...

Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c

2025-08-21 15:40:38 +02:00

..

macros

Merge remote-tracking branch 'pret/master' into pret-merge

2025-08-21 15:40:38 +02: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