more battle core labels

9 files changed, 76 insertions, 77 deletions

diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index 6d5ad2ebf..bfbffc828 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -211,94 +211,93 @@ ReadBTTrainerParty: ; 1702b7
 	ret
 ; 170394
 
-Function170394: ; 170394
-	ld hl, $c608 + 11
-	ld d, $3
-.asm_170399
+ValidateBTParty: ; 170394
+; Check for and fix errors in party data
+	ld hl, wBT_OTTempPkmn1Species
+	ld d, BATTLETOWER_NROFPKMNS
+.pkmn_loop
 	push de
 	push hl
 	ld b, h
 	ld c, l
 	ld a, [hl]
 	and a
-	jr z, .asm_1703b1
-	cp $ff
-	jr z, .asm_1703b1
-	cp $fe
-	jr z, .asm_1703b1
-	cp $fd
-	jr z, .asm_1703b1
-	cp $fc
-	jr nz, .asm_1703b4
+idx = $ff
+rept ($ff +- NUM_POKEMON)
+	jr z, .invalid
+	cp idx
+idx = idx +- 1
+endr
+	jr nz, .valid
 
-.asm_1703b1
-	ld a, $eb
+.invalid
+	ld a, SMEARGLE
 	ld [hl], a
 
-.asm_1703b4
+.valid
 	ld [CurSpecies], a
 	call GetBaseData
 	ld a, $5
 	call GetSRAMBank
-	ld a, [$b2fb]
+	ld a, [$b2fb] ; s5_b2fb ; max level?
 	call CloseSRAM
 	ld e, a
-	ld hl, $001f
+	ld hl, MON_LEVEL
 	add hl, bc
 	ld a, [hl]
-	cp $2
-	ld a, $2
-	jr c, .asm_1703d6
+	cp MIN_LEVEL
+	ld a, MIN_LEVEL
+	jr c, .load
 	ld a, [hl]
 	cp e
-	jr c, .asm_1703d7
+	jr c, .dont_load
 	ld a, e
 
-.asm_1703d6
+.load
 	ld [hl], a
 
-.asm_1703d7
+.dont_load
 	ld [CurPartyLevel], a
-	ld hl, $0002
+	ld hl, MON_MOVES
 	add hl, bc
-	ld d, $3
+	ld d, NUM_MOVES - 1
 	ld a, [hli]
 	and a
-	jr z, .asm_1703ea
-	cp $fc
-	jr nc, .asm_1703ea
-	jr .asm_1703f4
+	jr z, .not_move
+	cp NUM_ATTACKS + 1
+	jr nc, .not_move
+	jr .valid_move
 
-.asm_1703ea
+.not_move
 	dec hl
-	ld a, $1
+	ld a, POUND
 	ld [hli], a
 	xor a
 rept 2
 	ld [hli], a
 endr
 	ld [hl], a
-	jr .asm_1703ff
+	jr .done_moves
 
-.asm_1703f4
+.valid_move
 	ld a, [hl]
-	cp $fc
-	jr c, .asm_1703fb
+	cp NUM_ATTACKS + 1
+	jr c, .next
 	ld [hl], $0
 
-.asm_1703fb
+.next
 	inc hl
 	dec d
-	jr nz, .asm_1703f4
+	jr nz, .valid_move
 
-.asm_1703ff
-	ld hl, $0024
+.done_moves
+	ld hl, MON_MAXHP
 	add hl, bc
 	ld d, h
 	ld e, l
 	push hl
 	push de
-	ld hl, $000a
+	ld hl, MON_EXP + 2
 	add hl, bc
 	ld b, $1
 	predef CalcPkmnStats
@@ -317,7 +316,7 @@ endr
 	add hl, bc
 	pop de
 	dec d
-	jp nz, .asm_170399
+	jp nz, .pkmn_loop
 	ret
 ; 170426
 
@@ -326,20 +325,20 @@ BT_ChrisName: ; 170426
 ; 17042c
 
 Function17042c: ; 17042c
-	ld hl, OTPartyMon2ID
-	ld a, $7
-.asm_170431
+	ld hl, BT_TrainerTextIndex + $be
+	ld a, 7
+.loop
 	push af
 	push hl
-	ld c, $12
-.asm_170435
+	ld c, 18
+.loop2
 	ld a, [hli]
 	ld b, a
 	ld a, [hli]
 	and a
-	jr z, .asm_170451
+	jr z, .skip
 	cp $f
-	jr nc, .asm_17045b
+	jr nc, .exit_inner_loop
 	push hl
 	ld hl, Unknown_170470
 	dec a
@@ -349,34 +348,34 @@ Function17042c: ; 17042c
 	ld a, [hl]
 	pop hl
 	cp b
-	jr c, .asm_17045b
-	jr z, .asm_17045b
+	jr c, .exit_inner_loop
+	jr z, .exit_inner_loop
 	jr .asm_170456
 
-.asm_170451
+.skip
 	ld a, b
 	cp $fc
-	jr nc, .asm_17045b
+	jr nc, .exit_inner_loop
 
 .asm_170456
 	dec c
-	jr nz, .asm_170435
-	jr .asm_170466
+	jr nz, .loop2
+	jr .dont_copy
 
-.asm_17045b
+.exit_inner_loop
 	pop de
 	push de
 	ld hl, Unknown_17047e
 	ld bc, BATTLETOWER_TRAINERDATALENGTH
 	call CopyBytes
 
-.asm_170466
+.dont_copy
 	pop hl
 	ld de, $00e0
 	add hl, de
 	pop af
 	dec a
-	jr nz, .asm_170431
+	jr nz, .loop
 	ret
 ; 170470
 
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index cb152cefd..978a0fc14 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e)
 	ret
 
 .asm_17a92c
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	call Function17a99e
 	ld hl, $d088
 	set 7, [hl]
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 0f0e1852e..78fef3f56 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -2927,7 +2927,7 @@ UnknownText_0x8a23c: ; 0x8a23c
 ; 0x8a241
 
 Function8a241: ; 8a241 (22:6241)
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	call Function891fe
 	call Function8a262
 	jr nc, .asm_8a254
@@ -3455,7 +3455,7 @@ Palette_8a624: ; 8a624
 ; 8a62c
 
 Function8a62c: ; 8a62c (22:662c)
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	call Function891fe
 	xor a
 	call Function8b94a
@@ -3885,7 +3885,7 @@ Function8a999: ; 8a999 (22:6999)
 	jr c, .asm_8a9bb
 	push bc
 	push de
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	pop de
 	dec e
 	ld a, e
@@ -4141,7 +4141,7 @@ Function8ab77: ; 8ab77 (22:6b77)
 
 Function8ab93: ; 8ab93 (22:6b93)
 	call WhiteBGMap
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	callba Function105688
 	call ClearSprites
 	call Function891fe
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 7ffe48b9e..851b6d2c6 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -242,7 +242,7 @@ Function10016f: ; 10016f
 	jr z, .asm_1001af
 	cp $f8
 	ret z
-	ret
+	ret   ; ????????????????????????????
 
 .asm_1001af
 	ld a, $d7
@@ -4483,7 +4483,7 @@ Unknown_101d8d: ; 101d8d
 
 Function101d95: ; 101d95
 	call Function101ee2
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	ld e, $e
 	call Function101ee4
 	ld hl, wcd29
@@ -6256,7 +6256,7 @@ Jumptable_1029cb: ; 1029cb
 ; 1029cf
 
 Function1029cf: ; 1029cf
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	hlcoord 10, 7
 	ld b, $3
 	ld c, $8
@@ -6384,7 +6384,7 @@ Function102a3b: ; 102a3b
 	ld a, [hli]
 	ld [wc731], a
 	ld a, [hl]
-	ld [wc732], a
+	ld [wPlayerCharging], a
 	ld a, [wcd4d]
 	dec a
 	ld hl, OTPartyMon1DVs
@@ -6401,7 +6401,7 @@ Function102a3b: ; 102a3b
 	ld c, l
 	callba GetCaughtGender
 	ld a, c
-	ld [wc733], a
+	ld [wEnemyCharging], a
 	ret
 ; 102b12
 
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index b10404b78..fcd99e927 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -1259,7 +1259,7 @@ Function1089d2:
 	call Function108a92
 	ld de, wc703
 	call Function108a9c
-	ld a, [wc733]
+	ld a, [wEnemyCharging]
 	ld de, wc724
 	call Function108aa3
 	ld de, wc731
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 7a439246d..8462331d6 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -7658,7 +7658,7 @@ Function11b7e5: ; 11b7e5
 	ld a, [$c608 + 11]
 	ld [wc731], a
 	ld a, [$c608 + 12]
-	ld [wc732], a
+	ld [wPlayerCharging], a
 	ld hl, $c608 + 26
 	ld a, [hli]
 	ld [wc72f], a
@@ -7667,7 +7667,7 @@ Function11b7e5: ; 11b7e5
 	ld bc, $c608 + 5
 	callba GetCaughtGender
 	ld a, c
-	ld [wc733], a
+	ld [wEnemyCharging], a
 	call SpeechTextBox
 	call FadeToMenu
 	callba Function108016
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index dd661851d..698858b2e 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -884,7 +884,7 @@ Function16d42e: ; 16d42e
 ; 16d43b
 
 Function16d43b: ; 16d43b
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	call WhiteBGMap
 	call ClearTileMap
 	call ClearSprites
@@ -1034,7 +1034,7 @@ Function16d6ca: ; 16d6ca
 ; 16d6ce
 
 Function16d6ce: ; 16d6ce
-	call LoadMenuDataHeader_0x1d75
+	call LoadPartyMenuDataHeader
 	call Function16d6e1
 	callba Function87d
 	call Call_ExitMenu
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 39a8fbc41..54d22b8ec 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -62,11 +62,11 @@ Function17005a: ; 17005a
 	ld a, [hli]
 	ld [wc731], a
 	ld a, [hl]
-	ld [wc732], a
+	ld [wPlayerCharging], a
 	ld bc, $a82c
 	callba GetCaughtGender
 	ld a, c
-	ld [wc733], a
+	ld [wEnemyCharging], a
 	ld a, [wcd81]
 	ld [wc74e], a
 	call CloseSRAM
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index 9fd476d7f..a912c2770 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -285,7 +285,7 @@ Function17d0f3: ; 17d0f3
 	ld a, [$c608 + 11]
 	ld [wc731], a
 	ld a, [$c608 + 12]
-	ld [wc732], a
+	ld [wPlayerCharging], a
 	ld hl, $c608 + 26
 	ld a, [hli]
 	ld [wc72f], a
@@ -294,7 +294,7 @@ Function17d0f3: ; 17d0f3
 	ld bc, $c608 + 5
 	callba GetCaughtGender
 	ld a, c
-	ld [wc733], a
+	ld [wEnemyCharging], a
 	call SpeechTextBox
 	call FadeToMenu
 	callba Function10804d