summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-23 20:46:23 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-23 20:46:23 -0500
commitd7a5ea998d5c92607b32e633d8875898a6bc450b (patch)
treecba5438a7d0e15762e032816f67774dd4b2ec9d8 /wram.asm
parent8152ab612c0405d9e0074b7d51c9785e0dd3bc95 (diff)
More battle anims and bg effects
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm21
1 files changed, 16 insertions, 5 deletions
diff --git a/wram.asm b/wram.asm
index bca53e2a5..7b22398bc 100644
--- a/wram.asm
+++ b/wram.asm
@@ -755,6 +755,7 @@ EnemyDamageTaken:: ; c684
ds 2
wBattleReward:: ds 3
+wBattleAnimParam::
wKickCounter::
wPresentPower:: ds 1
wc68a::
@@ -3317,10 +3318,22 @@ AnimObject09:: battle_anim_struct AnimObject09
AnimObject10:: battle_anim_struct AnimObject10
ActiveAnimObjectsEnd:: ; d3aa
+battle_bg_effect: MACRO
+\1_Function:: ds 1
+\1_01:: ds 1
+\1_02:: ds 1
+\1_03:: ds 1
+endm
+
ActiveBGEffects:: ; d3fa
- ds 4 * 5
+BGEffect1:: battle_bg_effect BGEffect1
+BGEffect2:: battle_bg_effect BGEffect2
+BGEffect3:: battle_bg_effect BGEffect3
+BGEffect4:: battle_bg_effect BGEffect4
+BGEffect5:: battle_bg_effect BGEffect5
+ActiveBGEffectsEnd::
-wNumActiveBattleAnims:: ds 1
+wNumActiveBattleAnims:: ds 1 ; d40e
BattleAnimFlags:: ; d40f
ds 1
@@ -3336,14 +3349,12 @@ BattleAnimVar:: ; d416
ds 1
BattleAnimByte:: ; d417
ds 1
-w5_d418:: ds 1
+wBattleAnimOAMPointerLo:: ds 1 ; d418
BattleAnimTemps:: ; d419
ds 8
ds 1
w5_d422:: ds $32
wBattleAnimEnd::
- ds $e
-; d462
SECTION "WRAM 5 MOBILE", WRAMX [$d800], BANK [5]
w5_d800:: ds $200