summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2020-06-05 17:29:27 +0100
committerlibjet <libj3t@gmail.com>2020-06-05 17:29:27 +0100
commitaec46b791576a46520678e9465292de8e42ee1f9 (patch)
treef12c42e5e3fa7bb2f0280de7130e5865a1edf6f1 /main.asm
parent8ccc59b89445976e9e9bdc77ba797b51290a1e8f (diff)
Add engine/battle_anims/core.asm
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm17
1 files changed, 8 insertions, 9 deletions
diff --git a/main.asm b/main.asm
index 721bc5bd..4a4d91c5 100644
--- a/main.asm
+++ b/main.asm
@@ -299,23 +299,22 @@ SECTION "Move Animations", ROMX
INCLUDE "engine/events/bug_contest/display_stats.asm"
INCLUDE "engine/battle_anims/anim_commands.asm"
+INCLUDE "engine/battle_anims/core.asm"
-QueueBattleAnimation::
- dr $cc8f0, $cc958
-BattleAnimOAMUpdate::
- dr $cc958, $cca97
-_ExecuteBGEffects::
- dr $cca97, $cca9e
-_QueueBGEffect::
- dr $cca9e, $ccf0d
+BattleAnimObjects::
+ dr $ccaa5, $ccf0d
DoBattleAnimFrame::
dr $ccf0d, $ce6aa
BattleAnim_Sine_e::
dr $ce6aa, $ce6b0
BattleAnim_Cosine_e::
- dr $ce6b0, $ce78b
+ dr $ce6b0, $ce716
+GetBattleAnimFrame::
+ dr $ce716, $ce781
+GetBattleAnimOAMPointer::
+ dr $ce781, $ce78b
LoadBattleAnimGFX::
dr $ce78b, $cfce3