From ee86b367662ab8f7a81a644c66f5bf14ead59ba8 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Fri, 15 Feb 2019 17:21:51 +0100
Subject: [PATCH] =?UTF-8?q?wNumActiveBattleAnims=20=E2=86=92=20wLastAnimOb?=
 =?UTF-8?q?jectIndex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This variable never decrements, it only increments to give each battle
animation a different, and incremental "index".
---
 engine/battle_anims/bg_effects.asm | 4 ++--
 engine/battle_anims/core.asm       | 4 ++--
 wram.asm                           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 0f2e716ca..a510038a5 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -416,7 +416,7 @@ BattleBGEffect_BattlerObj_1Row:
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
-	ld hl, wNumActiveBattleAnims
+	ld hl, wLastAnimObjectIndex
 	inc [hl]
 	call EndBattleBGEffect
 	ret
@@ -483,7 +483,7 @@ BattleBGEffect_BattlerObj_2Row:
 .zero
 	call BGEffect_CheckFlyDigStatus
 	jr z, .not_flying_digging
-	ld hl, wNumActiveBattleAnims
+	ld hl, wLastAnimObjectIndex
 	inc [hl]
 	call EndBattleBGEffect
 	ret
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 86863389c..c5afb53ba 100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -15,7 +15,7 @@ QueueBattleAnimation:
 .done
 	ld c, l
 	ld b, h
-	ld hl, wNumActiveBattleAnims
+	ld hl, wLastAnimObjectIndex
 	inc [hl]
 	call InitBattleAnimation
 	ret
@@ -38,7 +38,7 @@ endr
 	ld d, h
 	ld hl, BATTLEANIMSTRUCT_INDEX
 	add hl, bc
-	ld a, [wNumActiveBattleAnims]
+	ld a, [wLastAnimObjectIndex]
 	ld [hli], a ; Index
 	ld a, [de]
 	inc de
diff --git a/wram.asm b/wram.asm
index e81f01d1a..4f37aa32f 100644
--- a/wram.asm
+++ b/wram.asm
@@ -3045,7 +3045,7 @@ wBGEffect4:: battle_bg_effect wBGEffect4
 wBGEffect5:: battle_bg_effect wBGEffect5
 wActiveBGEffectsEnd::
 
-wNumActiveBattleAnims:: db ; d40e
+wLastAnimObjectIndex:: db ; d40e
 
 wBattleAnimFlags:: db ; d40f
 wBattleAnimAddress:: dw ; d410