Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

This commit is contained in:
ultima-soul committed 2021-03-22 23:08:19 -07:00
commit 5bab9474dc
458 files changed
+23205 -17992

No files matched your search

+2 -2
View File
@@ -14477,7 +14477,7 @@ Move_TWINEEDLE:
Move_FIRE_BLAST:
loadspritegfx ANIM_TAG_SMALL_EMBER
createsoundtask sub_8158B30, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2
createsoundtask SoundTask_FireBlast, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2
call FireBlastRing
call FireBlastRing
call FireBlastRing
@@ -16252,7 +16252,7 @@ Move_FISSURE:
delay 40
restorebg
waitbgfadeout
setarg 7, 0xFFFF
setarg 7, -1
waitbgfadein
end