summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2020-05-31 02:42:16 +0100
committerlibjet <libj3t@gmail.com>2020-05-31 02:42:16 +0100
commit8a892f8240d1ed4fc69a00b4740dafa438d2efca (patch)
treeaea78e6d5fe9e681b9e6e0882d9248ebedc01fc8 /main.asm
parent61f53d2e8fb66c105485216757612756fddb6e8d (diff)
Add engine/events/field_moves.asm
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm17
1 files changed, 4 insertions, 13 deletions
diff --git a/main.asm b/main.asm
index a4c7ecc9..421702f8 100644
--- a/main.asm
+++ b/main.asm
@@ -235,19 +235,8 @@ INCLUDE "engine/rtc/reset_password.asm"
INCLUDE "engine/menus/delete_save.asm"
INCLUDE "engine/tilesets/timeofday_pals.asm"
INCLUDE "engine/battle/battle_transition.asm"
+INCLUDE "engine/events/field_moves.asm"
-PlayWhirlpoolSound::
- dr $8ca5e, $8ca6b
-BlindingFlash::
- dr $8ca6b, $8ca8e
-ShakeHeadbuttTree::
- dr $8ca8e, $8cbb8
-OWCutAnimation::
- dr $8cbb8, $8cd65
-FlyFromAnim::
- dr $8cd65, $8cdab
-FlyToAnim::
- dr $8cdab, $8ce7c
MagnetTrain::
dr $8ce7c, $8d174
@@ -256,7 +245,9 @@ ClearSpriteAnims::
PlaySpriteAnimationsAndDelayFrame::
dr $8d183, $8d18a
PlaySpriteAnimations::
- dr $8d18a, $8d1c9
+ dr $8d18a, $8d19b
+DoNextFrameForAllSprites::
+ dr $8d19b, $8d1c9
DoNextFrameForFirst16Sprites::
dr $8d1c9, $8d1f7
_InitSpriteAnimStruct::