Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2d17ad27f9
pokeemerald-expansion/asm
History
Hedara e758d55a03 Merge remote-tracking branch 'pret/master' into pret-merge 
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor

 Conflicts:
	asm/macros/battle_anim_script.inc
	data/battle_anim_scripts.s
	include/constants/battle_anim.h
	src/battle_anim_bug.c
	src/battle_anim_dragon.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c
2026-01-31 19:20:54 +01:00
..
macros Merge remote-tracking branch 'pret/master' into pret-merge 2026-01-31 19:20:54 +01: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