fix labels for and rename GetBattleVarPair to GetBattleVar

1 files changed, 34 insertions, 34 deletions

diff --git a/main.asm b/main.asm
index 134a9f3ed..9449ae6cf 100644
--- a/main.asm
+++ b/main.asm
@@ -2660,15 +2660,15 @@ UpdateBattleHuds: ; 39d4
 ; 39e1
 
 
-CleanGetBattleVarPair: ; 39e1
+GetBattleVar: ; 39e1
 ; Preserves hl.
 	push hl
-	call GetBattleVarPair
+	call _GetBattleVar
 	pop hl
 	ret
 ; 39e7
 
-GetBattleVarPair: ; 39e7
+_GetBattleVar: ; 39e7
 ; Get variable from pair a, depending on whose turn it is.
 ; There are 21 variable pairs.
 
@@ -37192,11 +37192,11 @@ Function3c27c: ; 3c27c
 	xor a
 	ld [hl], a
 	ld a, $2
-	call GetBattleVarPair
+	call _GetBattleVar
 	push af
 	set 7, [hl]
 	ld a, $c
-	call GetBattleVarPair
+	call _GetBattleVar
 	push hl
 	push af
 	xor a
@@ -37815,18 +37815,18 @@ Function3c6de: ; 3c6de
 
 Function3c6ed: ; 3c6ed
 	ld a, $5
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 2, [hl]
 	res 5, [hl]
 	ld a, $9
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 6, [hl]
 	ret
 ; 3c6fe
 
 Function3c6fe: ; 3c6fe
 	ld a, $4
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 6, [hl]
 	ret
 ; 3c706
@@ -37851,7 +37851,7 @@ Function3c716: ; 3c716
 	call Function3c706
 	ret z
 	ld a, $a
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	and $18
 	jr z, .asm_3c768
 	ld hl, $47e2
@@ -37877,7 +37877,7 @@ Function3c716: ; 3c716
 
 .asm_3c74d
 	ld a, $4
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	bit 0, a
 	jr z, .asm_3c765
 	call Function3cc76
@@ -37899,7 +37899,7 @@ Function3c716: ; 3c716
 	call Function3c706
 	jp z, $47f7
 	ld a, $3
-	call GetBattleVarPair
+	call _GetBattleVar
 	bit 7, [hl]
 	jr z, .asm_3c7a1
 	call Function3c8e4
@@ -37907,7 +37907,7 @@ Function3c716: ; 3c716
 	ld [$cfca], a
 	ld de, $0107
 	ld a, $7
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	and $60
 	call z, Function3ee0f
 	call Function3c8e4
@@ -37923,7 +37923,7 @@ Function3c716: ; 3c716
 	call Function3c706
 	jr z, .asm_3c7f7
 	ld a, $0
-	call GetBattleVarPair
+	call _GetBattleVar
 	bit 0, [hl]
 	jr z, .asm_3c7c5
 	xor a
@@ -37939,7 +37939,7 @@ Function3c716: ; 3c716
 	call Function3c706
 	jr z, .asm_3c7f7
 	ld a, $0
-	call GetBattleVarPair
+	call _GetBattleVar
 	bit 1, [hl]
 	jr z, .asm_3c7e9
 	xor a
@@ -37992,7 +37992,7 @@ Function3c801: ; 3c801
 
 .asm_3c827
 	ld a, $0
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	bit 4, a
 	ret z
 	dec [hl]
@@ -38004,7 +38004,7 @@ Function3c801: ; 3c801
 	pop af
 	ret nz
 	ld a, $0
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 4, [hl]
 	ld a, [hBattleTurn]
 	and a
@@ -38064,7 +38064,7 @@ Function3c874: ; 3c874
 	and a
 	ret z
 	ld a, $3
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	bit 4, a
 	ret nz
 	ld a, [de]
@@ -38074,7 +38074,7 @@ Function3c874: ; 3c874
 	dec [hl]
 	jr z, .asm_3c8de
 	ld a, $2
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	and $60
 	jr nz, .asm_3c8d3
 	call Function3c8e4
@@ -38320,7 +38320,7 @@ Function3ca26: ; 3ca26
 	ld hl, $48b6
 	call StdBattleTextBox
 	ld a, $10
-	call GetBattleVarPair
+	call _GetBattleVar
 	push af
 	ld a, $f8
 	ld [hl], a
@@ -38335,7 +38335,7 @@ Function3ca26: ; 3ca26
 	ld [CurDamage], a
 	ld [$d257], a
 	ld a, $10
-	call GetBattleVarPair
+	call _GetBattleVar
 	pop af
 	ld [hl], a
 	call UpdateBattleMonInParty
@@ -38539,7 +38539,7 @@ HandleWeather: ; 3cb9e
 
 .asm_3cbd0
 	ld a, BATTLE_VARS_SUBSTATUS3
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	bit SUBSTATUS_UNDERGROUND, a
 	ret nz
 
@@ -41087,7 +41087,7 @@ Function3dc5a: ; 3dc5a
 
 Function3dc5b: ; 3dc5b
 	ld a, $10
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	ld b, a
 	call Function3c5ec
 	ld a, b
@@ -41107,7 +41107,7 @@ Function3dc5b: ; 3dc5b
 	ld a, $d
 	rst FarCall
 	ld a, $10
-	call GetBattleVarPair
+	call _GetBattleVar
 	ld a, $ff
 	ld [hl], a
 	pop af
@@ -41323,7 +41323,7 @@ Function3dde9: ; 3dde9
 	dec hl
 	ld b, [hl]
 	ld a, $b
-	call GetBattleVarPair
+	call _GetBattleVar
 	and b
 	ret z
 	xor a
@@ -41332,18 +41332,18 @@ Function3dde9: ; 3dde9
 	call UpdateOpponentInParty
 	pop bc
 	ld a, $9
-	call GetBattleVarPair
+	call _GetBattleVar
 	and [hl]
 	res 0, [hl]
 	ld a, $5
-	call GetBattleVarPair
+	call _GetBattleVar
 	and [hl]
 	res 0, [hl]
 	ld a, b
 	cp $7f
 	jr nz, .asm_3de26
 	ld a, $7
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 7, [hl]
 
 .asm_3de26
@@ -41378,7 +41378,7 @@ Function3dde9: ; 3dde9
 
 Function3de51: ; 3de51
 	ld a, $7
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	bit 7, a
 	ret z
 	callab GetOpponentItem
@@ -41392,7 +41392,7 @@ Function3de51: ; 3de51
 	ld a, [hl]
 	ld [$d265], a
 	ld a, $7
-	call GetBattleVarPair
+	call _GetBattleVar
 	res 7, [hl]
 	call GetItemName
 	call Function3ddc8
@@ -44057,7 +44057,7 @@ _BattleRandom: ; 3edd8
 
 Function3ee0f: ; 3ee0f
 	ld a, BATTLE_VARS_SUBSTATUS3
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
 	ret nz
 ; 3ee17
@@ -72689,7 +72689,7 @@ DoWeatherModifiers: ; fbda4
 	ld de, .WeatherMoveModifiers
 
 	ld a, BATTLE_VARS_MOVE_EFFECT
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	ld c, a
 
 .CheckWeatherMove
@@ -77584,17 +77584,17 @@ UsedMoveText: ; 105db9
 .start
 ; get address for last move
 	ld a, $13 ; last move
-	call GetBattleVarPair
+	call _GetBattleVar
 	ld d, h
 	ld e, l
 	
 ; get address for last counter move
 	ld a, $11
-	call GetBattleVarPair
+	call _GetBattleVar
 	
 ; get move animation (id)
 	ld a, $c ; move animation
-	call CleanGetBattleVarPair
+	call GetBattleVar
 	ld [$d265], a
 	
 ; check actor ????