changed labels and added comments

8 files changed, 46 insertions, 46 deletions

diff --git a/battle/core.asm b/battle/core.asm
index 56587ca75..2e1019384 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -3280,7 +3280,7 @@ Function3d4c3: ; 3d4c3
 	call Function3d7a0
 	call NewEnemyMonStatus
 	call ResetEnemyStatLevels
-	call Function3d7c7
+	call Function_SetEnemyPkmnAndSendOutAnimation
 	call BreakAttraction
 	call Function3d57a
 	ret
@@ -3299,8 +3299,8 @@ Function3d4e1: ; 3d4e1
 	call Function3d74b
 	push af
 	call Function3d7a0
-	call Function3d7b8
-	call Function3d7c7
+	call Function_BattleTextEnemySentOut
+	call Function_SetEnemyPkmnAndSendOutAnimation
 	pop af
 	ret c
 	xor a
@@ -3323,8 +3323,8 @@ Function3d517: ; 3d517
 	ld a, 1
 	ld [wEnemyIsSwitching], a
 	call Function3d7a0
-	call Function3d7b8
-	jp Function3d7c7
+	call Function_BattleTextEnemySentOut
+	jp Function_SetEnemyPkmnAndSendOutAnimation
 ; 3d533
 
 Function3d533: ; 3d533
@@ -3697,14 +3697,14 @@ Function3d7a0: ; 3d7a0
 	jp Function3ee27
 ; 3d7b8
 
-Function3d7b8: ; 3d7b8
+Function_BattleTextEnemySentOut: ; 3d7b8
 	callab Battle_GetTrainerName
-	ld hl, BattleText_0x80af8
+	ld hl, BattleText_EnemySentOut
 	call StdBattleTextBox
 	jp WaitBGMap
 ; 3d7c7
 
-Function3d7c7: ; 3d7c7
+Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 	ld a, [TempEnemyMonSpecies]
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
diff --git a/data/battle_tower.asm b/data/battle_tower.asm
index aea1df2dd..375072a46 100644
--- a/data/battle_tower.asm
+++ b/data/battle_tower.asm
@@ -74,7 +74,7 @@ ENDC
 ; 1f8081
 
 Function_LoadRandomBattleTowerPkmn: ; 1f8081
-	ld c, $3		
+	ld c, $3
 .loop
 	push bc
 	ld a, BANK(sbe51)
diff --git a/engine/specials.asm b/engine/specials.asm
index 409b47434..d6b0d6650 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -144,7 +144,7 @@ SpecialsPointers:: ; c029
 	add_special Function17021d
 	add_special Function170b44
 	add_special Function11ba38
-	add_special Function170bd3
+	add_special SpecialCheckForBattleTowerRules
 	add_special Function117656
 	add_special Reset
 	add_special Function1011f1
diff --git a/main.asm b/main.asm
index 55d7116a3..d43485e45 100644
--- a/main.asm
+++ b/main.asm
@@ -60873,12 +60873,12 @@ UnknownText_0x8b1fc: ; 0x8b1fc
 	db "@"
 ; 0x8b201
 
-Function8b201: ; 8b201
+CheckForBattleTowerRules: ; 8b201
 	ld hl, StringBuffer2
 	ld [hl], "3"
 	inc hl
 	ld [hl], "@"
-	ld de, Unknown_8b215
+	ld de, CheckForBattleTowerRules_FunctionsText
 	call Function8b25b
 	ret z
 	call Function8b231
@@ -60886,29 +60886,29 @@ Function8b201: ; 8b201
 	ret
 ; 8b215
 
-Unknown_8b215: ; 8b215
+CheckForBattleTowerRules_FunctionsText: ; 8b215
 	db 4
-	dw Unknown_8b21a
-	dw Unknown_8b222
+	dw CheckForBattleTowerRules_Functions
+	dw CheckForBattleTowerRules_Text
 
-Unknown_8b21a: ; 8b21a
-	dw Function8b2da
+CheckForBattleTowerRules_Functions: ; 8b21a
+	dw Function_PartyCountEq3
 	dw Function8b2e2
 	dw Function8b32a
-	dw Function8b331
+	dw Function_HasPartyAnEgg
 ; 8b222
 
-Unknown_8b222: ; 8b222
-	dw UnknownText_0x8b22c
-	dw UnknownText_0x8b247
-	dw UnknownText_0x8b24c
-	dw UnknownText_0x8b251
-	dw UnknownText_0x8b256
+CheckForBattleTowerRules_Text: ; 8b222
+	dw JumpText_ExcuseMeYoureNotReady
+	dw JumbText_OnlyThreePkmnMayBeEntered
+	dw JumpText_ThePkmnMustAllBeDifferentKinds
+	dw JumpText_ThePkmnMustNotHoldTheSameItems
+	dw JumpText_YouCantTakeAnEgg
 ; 8b22c
 
-UnknownText_0x8b22c: ; 0x8b22c
+JumpText_ExcuseMeYoureNotReady: ; 0x8b22c
 	; Excuse me. You're not ready.
-	text_jump UnknownText_0x1c5944
+	text_jump Text_ExcuseMeYoureNotReady
 	db "@"
 ; 0x8b231
 
@@ -60936,27 +60936,27 @@ UnknownText_0x8b242: ; 0x8b242
 	db "@"
 ; 0x8b247
 
-UnknownText_0x8b247: ; 0x8b247
+JumbText_OnlyThreePkmnMayBeEntered: ; 0x8b247
 	; Only three #MON may be entered.
-	text_jump UnknownText_0x1c59c3
+	text_jump Text_OnlyThreePkmnMayBeEntered
 	db "@"
 ; 0x8b24c
 
-UnknownText_0x8b24c: ; 0x8b24c
+JumpText_ThePkmnMustAllBeDifferentKinds: ; 0x8b24c
 	; The @  #MON must all be different kinds.
-	text_jump UnknownText_0x1c59e5
+	text_jump Text_ThePkmnMustAllBeDifferentKinds
 	db "@"
 ; 0x8b251
 
-UnknownText_0x8b251: ; 0x8b251
+JumpText_ThePkmnMustNotHoldTheSameItems: ; 0x8b251
 	; The @  #MON must not hold the same items.
-	text_jump UnknownText_0x1c5a13
+	text_jump Text_ThePkmnMustNotHoldTheSameItems
 	db "@"
 ; 0x8b256
 
-UnknownText_0x8b256: ; 0x8b256
+JumpText_YouCantTakeAnEgg: ; 0x8b256
 	; You can't take an EGG!
-	text_jump UnknownText_0x1c5a42
+	text_jump Text_YouCantTakeAnEgg
 	db "@"
 ; 0x8b25b
 
@@ -61085,7 +61085,7 @@ Function8b2c1: ; 8b2c1
 	ret
 ; 8b2da
 
-Function8b2da: ; 8b2da
+Function_PartyCountEq3: ; 8b2da
 	ld a, [PartyCount]
 	cp 3
 	ret z
@@ -61169,7 +61169,7 @@ Function8b32a: ; 8b32a
 	ret
 ; 8b331
 
-Function8b331: ; 8b331
+Function_HasPartyAnEgg: ; 8b331
 	ld hl, PartyCount
 	ld a, [hli]
 	ld c, a
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 31825efaa..4296e6aed 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -73,7 +73,7 @@ UnknownScript_0x9e3fc:
 UnknownScript_0x9e40f:
 	writebyte $1a
 	special Function170687
-	special Function170bd3
+	special SpecialCheckForBattleTowerRules
 	if_not_equal $0, UnknownScript_0x9e4bb
 	writetext UnknownText_0x9ef1f
 	yesorno
@@ -190,7 +190,7 @@ UnknownScript_0x9e4ea:
 	writebyte $19
 	special Function170687
 	if_not_equal $0, UnknownScript_0x9e549
-	special Function170bd3
+	special SpecialCheckForBattleTowerRules
 	if_not_equal $0, UnknownScript_0x9e4bb
 	writebyte $5
 	special Function170687
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 35fe8287d..3423b6218 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -24237,8 +24237,8 @@ Function170bd2: ; 170bd2
 	ret
 ; 170bd3
 
-Function170bd3: ; 170bd3
-	callba Function8b201
+SpecialCheckForBattleTowerRules: ; 170bd3
+	callba CheckForBattleTowerRules
 	jr c, .asm_170bde
 	xor a
 	jr .asm_170be0
diff --git a/text/battle.asm b/text/battle.asm
index 3f29835aa..42f4aa40c 100644
--- a/text/battle.asm
+++ b/text/battle.asm
@@ -271,7 +271,7 @@ BattleText_0x80aca: ; 0x80aca
 	done
 ; 0x80af8
 
-BattleText_0x80af8: ; 0x80af8
+BattleText_EnemySentOut: ; 0x80af8
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
diff --git a/text/common_4.asm b/text/common_4.asm
index 09bfff312..c96d032f8 100644
--- a/text/common_4.asm
+++ b/text/common_4.asm
@@ -1262,7 +1262,7 @@ UnknownText_0x1c5937: ; 0x1c5937
 	done
 ; 0x1c5944
 
-UnknownText_0x1c5944: ; 0x1c5944
+Text_ExcuseMeYoureNotReady: ; 0x1c5944
 	text "Excuse me."
 	line "You're not ready."
 	para ""
@@ -1289,14 +1289,14 @@ UnknownText_0x1c59a3: ; 0x1c59a3
 	done
 ; 0x1c59c3
 
-UnknownText_0x1c59c3: ; 0x1c59c3
+Text_OnlyThreePkmnMayBeEntered: ; 0x1c59c3
 	text "Only three #MON"
 	line "may be entered."
 	para ""
 	done
 ; 0x1c59e5
 
-UnknownText_0x1c59e5: ; 0x1c59e5
+Text_ThePkmnMustAllBeDifferentKinds: ; 0x1c59e5
 	text "The @"
 	text_from_ram StringBuffer2
 	text " #MON"
@@ -1306,7 +1306,7 @@ UnknownText_0x1c59e5: ; 0x1c59e5
 	done
 ; 0x1c5a13
 
-UnknownText_0x1c5a13: ; 0x1c5a13
+Text_ThePkmnMustNotHoldTheSameItems: ; 0x1c5a13
 	text "The @"
 	text_from_ram StringBuffer2
 	text " #MON"
@@ -1316,7 +1316,7 @@ UnknownText_0x1c5a13: ; 0x1c5a13
 	done
 ; 0x1c5a42
 
-UnknownText_0x1c5a42: ; 0x1c5a42
+Text_YouCantTakeAnEgg: ; 0x1c5a42
 	text "You can't take an"
 	line "EGG!"
 	para ""