More unreferenced labels and unused text

17 files changed, 32 insertions, 25 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 9b00ba161..50e94c6d8 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -8091,7 +8091,7 @@ TextJump_GoodComeBack: ; 3f352
 	db "@"
 ; 3f357
 
-UnusedFunction_TextJump_ComeBack: ; 3f357
+Unreferenced_TextJump_ComeBack: ; 3f357
 ; this function doesn't seem to be used
 	ld hl, TextJump_ComeBack
 	ret
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 29bb3c215..50f412ce2 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -232,8 +232,7 @@ ClearActorHud: ; cc207
 	ret
 ; cc220
 
-Functioncc220: ; cc220
-; Appears to be unused.
+Unreferenced_Functioncc220: ; cc220
 	xor a
 	ld [hBGMapMode], a
 	ld a, LOW(vBGMap0 tile $28)
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 8bb2056ca..23679197f 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -246,7 +246,6 @@ BillsPCDepositMenuDataHeader: ; 0xe253d (38:653d)
 ; 0xe2564 (38:6564)
 
 Unreferenced_BillsPCClearThreeBoxes: ; e2564
-; unreferenced
 	hlcoord 0, 0
 	ld b,  4
 	ld c,  8
@@ -1586,7 +1585,7 @@ endr
 	db -1
 ; e2ed5
 
-BillsPC_UnusedFillBox: ; e2ed5
+Unreferenced_BillsPC_FillBox: ; e2ed5
 .row
 	push bc
 	push hl
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index 699fa7887..3fc99920a 100755
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -143,7 +143,7 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
 	and a
 	ret
 
-Functione512: ; unused
+Unreferenced_Functione512:
 	ld a, [PartyCount]
 	and a
 	jr z, .no_pkmn
@@ -212,7 +212,7 @@ BillsPC_WithdrawMenu: ; e559 (3:6559)
 	and a
 	ret
 
-Functione56d: ; unused
+Unreferenced_Functione56d:
 	ld a, [PartyCount]
 	cp PARTY_LENGTH
 	jr nc, .asm_e576
diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm
index c81271442..82b81b85c 100755
--- a/engine/clock_reset.asm
+++ b/engine/clock_reset.asm
@@ -220,6 +220,7 @@ RestartClock: ; 20021 (8:4021)
 	ret
 ; 20160 (8:4160)
 
+; unused
 .unreferenced ; 20160
 	ld a, [Buffer3]
 	ld b, a
diff --git a/engine/events.asm b/engine/events.asm
index 7dd87a318..7f362e07d 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -994,6 +994,7 @@ CountStep: ; 96b79
 	ret
 ; 96bd3
 
+; unused
 .unreferenced ; 96bd3
 	ld a, 7
 	scf
diff --git a/engine/events_2.asm b/engine/events_2.asm
index aaf6995b2..e4458d9aa 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -361,7 +361,7 @@ HandleCmdQueue:: ; 97e08
 	ret
 ; 97e25
 
-GetNthCmdQueueEntry: ; 97e25 unreferenced
+Unreferenced_GetNthCmdQueueEntry: ; 97e25
 	ld hl, wCmdQueue
 	ld bc, CMDQUEUE_ENTRY_SIZE
 	call AddNTimes
diff --git a/engine/mart.asm b/engine/mart.asm
index 4eff21fa3..1dcf508e6 100755
--- a/engine/mart.asm
+++ b/engine/mart.asm
@@ -892,7 +892,7 @@ Text_Mart_ICanPayThisMuch: ; 0x15f78
 	db "@"
 ; 0x15f7d
 
-DummyString ; 15f7d
+.UnusedString15f7d: ; 15f7d
 	db "!ダミー!@"
 
 Text_Mart_HowMayIHelpYou: ; 0x15f83
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index 6f9a0f557..c674a3b8c 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -765,7 +765,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: ; 11b27
 
 ; 11b56
 
-Dakutens: ; Dummied out
+Dakutens: ; unused
 	db "かが", "きぎ", "くぐ", "けげ", "こご"
 	db "さざ", "しじ", "すず", "せぜ", "そぞ"
 	db "ただ", "ちぢ", "つづ", "てで", "とど"
@@ -776,7 +776,7 @@ Dakutens: ; Dummied out
 	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
 	db $ff
 
-Handakutens: ; Dummied out
+Handakutens: ; unused
 	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
 	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
 	db $ff
@@ -1051,7 +1051,7 @@ INCBIN "gfx/icon/mail2.2bpp"
 
 ; 11f7a (4:5f7a)
 
-.Dummy: ; dummied out
+.UnusedString11f7a:
 	db "メールを かいてね@"
 
 ; 11f84
diff --git a/engine/party_menu.asm b/engine/party_menu.asm
index 59a9904aa..13181c626 100644
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -817,25 +817,33 @@ PartyMenuStrings: ; 0x504d2
 
 ChooseAMonString: ; 0x504e4
 	db "Choose a #MON.@"
+
 UseOnWhichPKMNString: ; 0x504f3
 	db "Use on which <PK><MN>?@"
+
 WhichPKMNString: ; 0x50504
 	db "Which <PK><MN>?@"
+
 TeachWhichPKMNString: ; 0x5050e
 	db "Teach which <PK><MN>?@"
+
 MoveToWhereString: ; 0x5051e
 	db "Move to where?@"
-ChooseAFemalePKMNString: ; 0x5052d  ; UNUSED
+
+ChooseAFemalePKMNString: ; 0x5052d
+; unused
 	db "Choose a ♀<PK><MN>.@"
-ChooseAMalePKMNString: ; 0x5053b    ; UNUSED
+
+ChooseAMalePKMNString: ; 0x5053b
+; unused
 	db "Choose a ♂<PK><MN>.@"
+
 ToWhichPKMNString: ; 0x50549
 	db "To which <PK><MN>?@"
 
 YouHaveNoPKMNString: ; 0x50556
 	db "You have no <PK><MN>!@"
 
-
 PrintPartyMenuActionText: ; 50566
 	ld a, [CurPartyMon]
 	ld hl, PartyMonNicknames
diff --git a/engine/player_movement.asm b/engine/player_movement.asm
index fa7cc84a5..57d18444f 100755
--- a/engine/player_movement.asm
+++ b/engine/player_movement.asm
@@ -316,7 +316,7 @@ DoPlayerMovement:: ; 80000
 	scf
 	ret
 
-; unused?
+; unused
 	xor a
 	ret
 
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 6fe2b0aa5..0c9a991ac 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -1751,7 +1751,7 @@ LoadStation_EvolutionRadio: ; 9183e (24:583e)
 
 ; 91853 (24:5853)
 
-LoadStation_Dummy: ; 91853
+Unreferenced_LoadStation: ; 91853
 	ret
 
 RadioMusicRestartDE: ; 91854 (24:5854)
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index e2292a6d8..26ffc7623 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -183,7 +183,7 @@ SlotsLoop: ; 927af (24:67af)
 	ld [wCurrSpriteOAMAddr], a
 	callfar DoNextFrameForFirst16Sprites
 	call .PrintCoinsAndPayout
-	call .DummyFunc
+	call .Stubbed_Function927d3
 	call DelayFrame
 	and a
 	ret
@@ -192,7 +192,7 @@ SlotsLoop: ; 927af (24:67af)
 	scf
 	ret
 
-.DummyFunc: ; 927d3 (24:67d3)
+.Stubbed_Function927d3: ; 927d3 (24:67d3)
 ; dummied out
 	ret
 	ld a, [wReel1ReelAction]
diff --git a/engine/specials.asm b/engine/specials.asm
index 0291a6d3c..60c5b745c 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -141,7 +141,7 @@ SpecialsPointers:: ; c029
 	add_special Special_Function1700ba
 	add_special Special_Function170114
 	add_special Special_BattleTowerBattle
-	add_special Special_Function1704e1
+	add_special UnusedSpecial_Function1704e1
 	add_special DummySpecial17021d
 	add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite
 	add_special Special_Function11ba38
diff --git a/engine/sprites.asm b/engine/sprites.asm
index e1aad4832..6551747c4 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -527,8 +527,7 @@ GetFrameOAMPointer: ; 8d1a2
 	ret
 ; 8d1ac
 
-BrokenGetStdGraphics: ; 8d1ac
-; dummied out
+Unreferenced_BrokenGetStdGraphics: ; 8d1ac
 	push hl
 	ld l, a
 	ld h, 0
diff --git a/engine/start_menu.asm b/engine/start_menu.asm
index 7a2274b08..8f7488435 100755
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -1268,7 +1268,7 @@ MonMenu_Fly: ; 12e30
 	ld a, $0
 	ret
 
-.Unused:
+.Unreferenced:
 	ld a, $1
 	ret
 ; 12e55
diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm
index 10e657819..89a3ccefb 100755
--- a/engine/trade_animation.asm
+++ b/engine/trade_animation.asm
@@ -1563,8 +1563,8 @@ TradeAnim_WaitAnim2: ; 29886
 ; 29893
 
 
-DebugTrade: ; 29893
-; This function is unreferenced.
+Unreferenced_DebugTrade: ; 29893
+; This function is not referenced.
 ; It was meant for use in Japanese versions, so the
 ; constant used for copy length was changed by accident.