summaryrefslogtreecommitdiff
path: root/home/battle.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/battle.asm')
-rw-r--r--home/battle.asm56
1 files changed, 53 insertions, 3 deletions
diff --git a/home/battle.asm b/home/battle.asm
index 37f39572a..57bab4083 100644
--- a/home/battle.asm
+++ b/home/battle.asm
@@ -234,7 +234,7 @@ endr
; 3a90
-FarJumpText:: ; 3a90
+FarCopyRadioText:: ; 3a90
inc hl
ld a, [hROMBank]
push af
@@ -249,8 +249,8 @@ FarJumpText:: ; 3a90
ld l, a
ld a, d
ld h, a
- ld de, wd00c
- ld bc, $0028
+ ld de, wRadioText
+ ld bc, 2 * SCREEN_WIDTH
call CopyBytes
pop af
ld [hROMBank], a
@@ -309,3 +309,53 @@ GLOBAL BattleText
rst Bankswitch
ret
; 3ae1
+
+GetBattleAnimPointer:: ; 3ae1
+
+GLOBAL BattleAnimations
+GLOBAL BattleAnimCommands
+
+ ld a, BANK(BattleAnimations)
+ rst Bankswitch
+
+ ld a, [hli]
+ ld [BattleAnimAddress], a
+ ld a, [hl]
+ ld [BattleAnimAddress + 1], a
+
+ ld a, BANK(BattleAnimCommands)
+ rst Bankswitch
+
+ ret
+; 3af0
+
+GetBattleAnimByte:: ; 3af0
+
+ push hl
+ push de
+
+ ld hl, BattleAnimAddress
+ ld e, [hl]
+ inc hl
+ ld d, [hl]
+
+ ld a, BANK(BattleAnimations)
+ rst Bankswitch
+
+ ld a, [de]
+ ld [BattleAnimByte], a
+ inc de
+
+ ld a, BANK(BattleAnimCommands)
+ rst Bankswitch
+
+ ld [hl], d
+ dec hl
+ ld [hl], e
+
+ pop de
+ pop hl
+
+ ld a, [BattleAnimByte]
+ ret
+; 3b0c