summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2020-06-05 18:23:26 +0100
committerlibjet <libj3t@gmail.com>2020-06-05 18:23:26 +0100
commitba1684444668d88c9f2e0ebc5ab4618e344f10e7 (patch)
tree3845db04922b0c1a3d2969f338700f96ffd791b0 /main.asm
parent81a8e61f6d0d0f70f1764793fd44498e225352e0 (diff)
Add engine/battle_anims/helpers.asm, and the rest of data/battle_anims
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm15
1 files changed, 6 insertions, 9 deletions
diff --git a/main.asm b/main.asm
index b7b26642..9db0c558 100644
--- a/main.asm
+++ b/main.asm
@@ -304,18 +304,15 @@ INCLUDE "data/battle_anims/objects.asm"
DoBattleAnimFrame::
dr $ccf0d, $ce6aa
-
BattleAnim_Sine_e::
dr $ce6aa, $ce6b0
BattleAnim_Cosine_e::
- dr $ce6b0, $ce716
-
-GetBattleAnimFrame::
- dr $ce716, $ce781
-GetBattleAnimOAMPointer::
- dr $ce781, $ce78b
-LoadBattleAnimGFX::
- dr $ce78b, $cfce3
+ dr $ce6b0, $ce704
+
+INCLUDE "engine/battle_anims/helpers.asm"
+INCLUDE "data/battle_anims/framesets.asm"
+INCLUDE "data/battle_anims/oam.asm"
+INCLUDE "data/battle_anims/object_gfx.asm"
SECTION "Font Inversed", ROMX