More battle core labels

5 files changed, 27 insertions, 27 deletions

diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 851b6d2c6..e7b73aa36 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -6382,7 +6382,7 @@ Function102a3b: ; 102a3b
 	ld hl, OTPartyMon1ID
 	call GetPartyLocation
 	ld a, [hli]
-	ld [wc731], a
+	ld [wEnemyWrapCount], a
 	ld a, [hl]
 	ld [wPlayerCharging], a
 	ld a, [wcd4d]
@@ -6390,9 +6390,9 @@ Function102a3b: ; 102a3b
 	ld hl, OTPartyMon1DVs
 	call GetPartyLocation
 	ld a, [hli]
-	ld [wc72f], a
+	ld [wEnemyTrappingMove], a
 	ld a, [hl]
-	ld [wc730], a
+	ld [wPlayerWrapCount], a
 	ld a, [wcd4d]
 	dec a
 	ld hl, OTPartyMon1Species
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index fcd99e927..72a8f9e8c 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -170,7 +170,7 @@ Function1080b7: ; 1080b7
 	ld de, VTiles0 tile $30
 	call Function1081e9
 	ld a, [wc702]
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	ld de, VTiles2 tile $31
 	call Function1081e9
 	ld a, [$c6d0]
@@ -515,7 +515,7 @@ Function10839b: ; 10839b
 	call Function1081ca
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	ld de, VTiles2
 	call Function108201
 	call EnableLCD
@@ -548,9 +548,9 @@ Function10839b: ; 10839b
 	ld [hWY], a
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld a, [wc72f]
+	ld a, [wEnemyTrappingMove]
 	ld [TempMonDVs], a
-	ld a, [wc730]
+	ld a, [wPlayerWrapCount]
 	ld [TempMonDVs + 1], a
 	ld b, $1a
 	call GetSGBLayout
@@ -650,7 +650,7 @@ Function1084d7: ; 1084d7
 	call Function1081ca
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	ld de, VTiles2
 	call Function108201
 	call EnableLCD
@@ -692,16 +692,16 @@ Function1084d7: ; 1084d7
 	ld [hWY], a
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld a, [wc72f]
+	ld a, [wEnemyTrappingMove]
 	ld [TempMonDVs], a
-	ld a, [wc730]
+	ld a, [wPlayerWrapCount]
 	ld [TempMonDVs + 1], a
 	ld b, $1a
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
 	ld a, [wc702]
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	call Function10898a
 	ld a, [wc702]
 	call Function108229
@@ -719,7 +719,7 @@ Function108589: ; 108589
 	call Function1081ca
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	ld de, VTiles2
 	call Function108201
 	call EnableLCD
@@ -761,16 +761,16 @@ Function108589: ; 108589
 	ld [hWY], a
 	ld a, [wc702]
 	ld [CurPartySpecies], a
-	ld a, [wc72f]
+	ld a, [wEnemyTrappingMove]
 	ld [TempMonDVs], a
-	ld a, [wc730]
+	ld a, [wPlayerWrapCount]
 	ld [TempMonDVs + 1], a
 	ld b, $1a
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
 	ld a, [wc702]
-	ld hl, wc72f
+	ld hl, wEnemyTrappingMove
 	call Function10898a
 	ld a, [wc702]
 	call Function108229
@@ -1262,7 +1262,7 @@ Function1089d2:
 	ld a, [wEnemyCharging]
 	ld de, wc724
 	call Function108aa3
-	ld de, wc731
+	ld de, wEnemyWrapCount
 	call Function108abe
 	call Function108a87
 	ret
@@ -1737,7 +1737,7 @@ Function108c9b: ; 108c9b
 	dec c
 	jr nz, .asm_108ccc
 
-	ld de, wc731
+	ld de, wEnemyWrapCount
 	ld c, $2
 .asm_108cd7
 	ld a, [hli]
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 8462331d6..9e22761b4 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -7656,14 +7656,14 @@ Function11b7e5: ; 11b7e5
 	ld a, $50
 	ld [de], a
 	ld a, [$c608 + 11]
-	ld [wc731], a
+	ld [wEnemyWrapCount], a
 	ld a, [$c608 + 12]
 	ld [wPlayerCharging], a
 	ld hl, $c608 + 26
 	ld a, [hli]
-	ld [wc72f], a
+	ld [wEnemyTrappingMove], a
 	ld a, [hl]
-	ld [wc730], a
+	ld [wPlayerWrapCount], a
 	ld bc, $c608 + 5
 	callba GetCaughtGender
 	ld a, c
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 54d22b8ec..d82b84e82 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -55,12 +55,12 @@ Function17005a: ; 17005a
 	ld [de], a
 	ld hl, $a841
 	ld a, [hli]
-	ld [wc72f], a
+	ld [wEnemyTrappingMove], a
 	ld a, [hl]
-	ld [wc730], a
+	ld [wPlayerWrapCount], a
 	ld hl, $a832
 	ld a, [hli]
-	ld [wc731], a
+	ld [wEnemyWrapCount], a
 	ld a, [hl]
 	ld [wPlayerCharging], a
 	ld bc, $a82c
@@ -177,7 +177,7 @@ Function170139: ; 170139
 	ld e, l
 	ld d, h
 	ld hl, PlayerName
-	ld bc, $0005
+	ld bc, $0005 ; Japanese name length
 	call CopyBytes
 	ld bc, PlayerID
 	ld de, PlayerGender
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index a912c2770..54b1d9203 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -283,14 +283,14 @@ Function17d0f3: ; 17d0f3
 	ld a, $50
 	ld [de], a
 	ld a, [$c608 + 11]
-	ld [wc731], a
+	ld [wEnemyWrapCount], a
 	ld a, [$c608 + 12]
 	ld [wPlayerCharging], a
 	ld hl, $c608 + 26
 	ld a, [hli]
-	ld [wc72f], a
+	ld [wEnemyTrappingMove], a
 	ld a, [hl]
-	ld [wc730], a
+	ld [wPlayerWrapCount], a
 	ld bc, $c608 + 5
 	callba GetCaughtGender
 	ld a, c