No more -bash000; engine/movement.asm, SPRITEMOVEFN

battle/anim_objects.asm

@@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1)
 
 
 Functioncc9bd: ; cc9bd
-	ld hl, $0000
+	ld hl, NONE
 	add hl, bc
 	ld [hl], $0
 	ret

battle/core.asm

@@ -3240,7 +3240,7 @@ MonFaintedAnimation: ; 3d444
 
 
 Function3d490: ; 3d490
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld c, a
 .asm_3d493
 	push bc
@@ -3264,7 +3264,7 @@ Function3d490: ; 3d490
 ; 3d4ae
 
 Function3d4ae: ; 3d4ae
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	ld c, a
 	cp $8
 	jr nz, .back
@@ -3646,7 +3646,7 @@ Function3d714: ; 3d714
 	push af
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
-	callba Functione538
+	callba CheckCurPartyMonFainted
 	pop bc
 	ld a, b
 	ld [CurPartyMon], a
@@ -9458,7 +9458,7 @@ Function3fc30: ; 3fc30
 Function3fc5b: ; 3fc5b
 	ld hl, Sprites
 	xor a
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld b, $6
 	ld e, $a8
 .asm_3fc65
@@ -9469,10 +9469,10 @@ Function3fc5b: ; 3fc5b
 	inc hl
 	ld [hl], e
 	inc hl
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	ld [hli], a
 	inc a
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld a, $1
 	ld [hli], a
 	ld a, d
@@ -9480,9 +9480,9 @@ Function3fc5b: ; 3fc5b
 	ld d, a
 	dec c
 	jr nz, .asm_3fc69
-	ld a, [hConnectionStripLength]
+	ld a, [hMapObjectIndexBuffer1]
 	add $3
-	ld [hConnectionStripLength], a
+	ld [hMapObjectIndexBuffer1], a
 	ld a, e
 	add $8
 	ld e, a

battle/effect_command_pointers.asm

@@ -1,5 +1,5 @@
 
-	dw $0000 ; padding
+	dw NONE ; padding
 
 BattleCommandPointers: ; 3fd28
 	dw BattleCommand01 ; 34084