summaryrefslogtreecommitdiff
path: root/battle/core.asm
diff options
context:
space:
mode:
Diffstat (limited to 'battle/core.asm')
-rw-r--r--battle/core.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/battle/core.asm b/battle/core.asm
index d0cbe1c38..f42fe3c55 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -3247,7 +3247,7 @@ MonFaintedAnimation: ; 3d444
Function3d490: ; 3d490
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer], a
ld c, a
.asm_3d493
push bc
@@ -3271,7 +3271,7 @@ Function3d490: ; 3d490
; 3d4ae
Function3d4ae: ; 3d4ae
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer]
ld c, a
cp $8
jr nz, .back
@@ -3663,7 +3663,7 @@ Function3d714: ; 3d714
push af
ld a, [CurBattleMon]
ld [CurPartyMon], a
- callba Functione538
+ callba CheckCurPartyMonFainted
pop bc
ld a, b
ld [CurPartyMon], a
@@ -9364,7 +9364,7 @@ Function3fb6c: ; 3fb6c
call TextBox
callba MobileTextBorder
hlcoord 1, 5
- ld bc, $0307
+ lb bc, 3, 7
call ClearBox
call Functione51
call Function3ed9f
@@ -9486,7 +9486,7 @@ Function3fc30: ; 3fc30
Function3fc5b: ; 3fc5b
ld hl, Sprites
xor a
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer], a
ld b, $6
ld e, $a8
.asm_3fc65
@@ -9497,10 +9497,10 @@ Function3fc5b: ; 3fc5b
inc hl
ld [hl], e
inc hl
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer]
ld [hli], a
inc a
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer], a
ld a, $1
ld [hli], a
ld a, d
@@ -9508,9 +9508,9 @@ Function3fc5b: ; 3fc5b
ld d, a
dec c
jr nz, .asm_3fc69
- ld a, [hConnectionStripLength]
+ ld a, [hMapObjectIndexBuffer]
add $3
- ld [hConnectionStripLength], a
+ ld [hMapObjectIndexBuffer], a
ld a, e
add $8
ld e, a