pokeemmo

History

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

clock_small.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

confetti.png

Fix file permissions.

2018-01-19 15:06:49 -05:00

emotes.pal

Added some conditional messages.

2021-04-18 21:00:27 -04:00

emotes.png

Added some conditional messages.