summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2020-06-02 17:04:41 +0100
committerlibjet <libj3t@gmail.com>2020-06-02 17:47:32 +0100
commit0e8c23326cd5ff59960ed54a9a51d00cc658fbde (patch)
treef0ce5c1456d64a9749f03a814d0bd33976e0b464 /main.asm
parent4dd92dd52efeaf851c732094b45a8e194ea612f0 (diff)
Add engine/battle_anims/bg_effects.asm
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm14
1 files changed, 8 insertions, 6 deletions
diff --git a/main.asm b/main.asm
index 29439c9d..5eebffac 100644
--- a/main.asm
+++ b/main.asm
@@ -378,14 +378,12 @@ INCLUDE "engine/pokemon/caught_data.asm"
SECTION "bank32", ROMX
-ExecuteBGEffects::
- dr $c8000, $c80d6
-DummyPredef2F::
- dr $c80d6, $c900a
+INCLUDE "engine/battle_anims/bg_effects.asm"
INCLUDE "data/moves/animations.asm"
LoadPoisonBGPals::
dr $cbc76, $cbcbd
+
TheEndGFX::
INCBIN "gfx/credits/theend.2bpp"
@@ -408,10 +406,14 @@ BattleAnimCmd_RaiseSub::
BattleAnimCmd_MinimizeOpp::
dr $cc67c, $cc836
ClearBattleAnims::
- dr $cc836, $ce6aa
+ dr $cc836, $cc8f0
+QueueBattleAnimation::
+ dr $cc8f0, $ce6aa
BattleAnim_Sine_e::
- dr $ce6aa, $cfce3
+ dr $ce6aa, $ce6b0
+BattleAnim_Cosine_e::
+ dr $ce6b0, $cfce3
SECTION "Font Inversed", ROMX