more battle animation labels

3 files changed, 44 insertions, 14 deletions

diff --git a/home.asm b/home.asm
index 11b6f4b37..f25db6bf7 100644
--- a/home.asm
+++ b/home.asm
@@ -2410,41 +2410,49 @@ StdBattleTextBox: ; 3ad5
 
 
 Function3ae1: ; 3ae1
-	ld a, $32
+
+	ld a, BANK(BattleAnimations)
 	rst Bankswitch
 
 	ld a, [hli]
-	ld [$d410], a
+	ld [BattleAnimAddress], a
 	ld a, [hl]
-	ld [$d411], a
-	ld a, $33
+	ld [BattleAnimAddress + 1], a
+
+	ld a, BANK(BattleAnimCommands)
 	rst Bankswitch
 
 	ret
 ; 3af0
 
 GetBattleAnimByte: ; 3af0
+
 	push hl
 	push de
-	ld hl, $d410
+
+	ld hl, BattleAnimAddress
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-	ld a, $32
+
+	ld a, BANK(BattleAnimations)
 	rst Bankswitch
 
 	ld a, [de]
-	ld [$d417], a
+	ld [BattleAnimByte], a
 	inc de
-	ld a, $33
+
+	ld a, BANK(BattleAnimCommands)
 	rst Bankswitch
 
 	ld [hl], d
 	dec hl
 	ld [hl], e
+
 	pop de
 	pop hl
-	ld a, [$d417]
+
+	ld a, [BattleAnimByte]
 	ret
 ; 3b0c
 
@@ -2453,17 +2461,17 @@ Function3b0c: ; 3b0c
 	and a
 	ret z
 
-	ld a, $00
+	ld a, LYOverridesBackup % $100
 	ld [Requested2bppSource], a
-	ld a, $d2
+	ld a, LYOverridesBackup / $100
 	ld [Requested2bppSource + 1], a
 
-	ld a, $00
+	ld a, LYOverrides % $100
 	ld [Requested2bppDest], a
-	ld a, $d1
+	ld a, LYOverrides / $100
 	ld [Requested2bppDest + 1], a
 
-	ld a, $9
+	ld a, (LYOverridesEnd - LYOverrides) / 16
 	ld [Requested2bpp], a
 	ret
 ; 3b2a
diff --git a/main.asm b/main.asm
index 86db50569..93af0d13a 100644
--- a/main.asm
+++ b/main.asm
@@ -86996,6 +86996,7 @@ Functionc9066: ; c9066 (32:5066)
 	ret
 ; c906f (32:506f)
 
+BattleAnimations: ; c906f
 INCBIN "baserom.gbc",$c906f,$cbcdd - $c906f
 
 Functioncbcdd: ; cbcdd
diff --git a/wram.asm b/wram.asm
index 1e22eb6f1..a860e1a01 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2137,6 +2137,27 @@ LYOverrides: ; d100
 	ds 144
 LYOverridesEnd:
 
+	ds 112
+
+LYOverridesBackup: ; d200
+	ds 144
+LYOverridesBackupEnd:
+
+
+SECTION "Battle Animations", WRAMX[$d410], BANK[5]
+
+BattleAnimAddress: ; d410
+	ds 2
+BattleAnimDuration: ; d412
+	ds 1
+BattleAnimParent: ; d413
+	ds 2
+	ds 2
+BattleAnimByte: ; d417
+	ds 1
+	ds 1
+BattleAnimTile: ; d419
+	ds 1
 
 SECTION "SRAMBank1",SRAM,BANK[1]