Eduardo Quezada 18aff2db3b Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	asm/macros/battle_anim_script.inc
#	data/battle_anim_scripts.s
#	include/constants/battle_anim.h
#	src/battle_anim.c
#	src/data/battle_anim.h

2024-07-27 16:26:37 -04:00

..

backgrounds

Adds combined pledge move effects (#3336)

2023-11-21 16:23:22 +01:00

masks

Document stat change animation

2023-08-08 23:56:16 -04:00

sprites

Merge branch '_RHH/master' into _RHH/upcoming

2024-07-27 16:26:37 -04:00

stat_change

Document stat change animation

2023-08-08 23:56:16 -04:00

unused

Fix two binary palettes

2023-02-17 13:27:39 -05:00