Hedara 4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge ...

Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c

2025-04-29 20:27:33 +02:00

..

macros

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

2025-04-29 20:27:33 +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