16 files changed, 31 insertions, 24 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 7317407a..12f7a101 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -5668,7 +5668,7 @@ BattleCommand_Charge:
 	text_far _BattleDugText
 	text_end
 
-BattleCommand3c:
+BattleCommand_Unused3C:
 ; unused
 	ret
 
@@ -6439,7 +6439,7 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm"
 
 INCLUDE "engine/battle/move_effects/rollout.asm"
 
-BattleCommand5d:
+BattleCommand_Unused5D:
 ; unused
 	ret
 
diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm
index 84e8c207..324d6c57 100644
--- a/engine/debug/color_picker.asm
+++ b/engine/debug/color_picker.asm
@@ -1456,9 +1456,9 @@ DebugTileset_PlaceCursor: ; unreferenced
 	inc c
 	ret
 
-; unused
+.clearsprites: ; unreferenced
 	call ClearSprites
 	ret
 
-; unused
+.dummy: ; unreferenced
 	ret
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index f41897ca..e5b90447 100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -1701,7 +1701,7 @@ Script_GetOnBike_Register:
 	special UpdatePlayerSprite
 	end
 
-; unused
+Overworld_DummyFunction: ; unreferenced
 	nop
 	ret
 
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index 06fb7b20..5c26daa7 100644
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -459,5 +459,4 @@ TrainerHouse:
 	ld [wScriptVar], a
 	jp CloseSRAM
 
-; unused
-	nop
+	nop ; unused
diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm
index 99a0f74b..83040f84 100644
--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@@ -109,7 +109,8 @@ CoinString:
 	db "COIN@"
 ShowMoney_TerminatorString:
 	db "@"
-	db "@" ; unused
+UnusedEmptyString: ; unreferenced
+	db "@"
 
 StartMenu_PrintSafariGameStatus: ; unreferenced
 	ld hl, wOptions
diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm
index de34057f..1610749c 100644
--- a/engine/menus/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
@@ -307,7 +307,8 @@ TrainerCard_Page1_PrintDexCaught_GameTime:
 	db   "#DEX"
 	next "PLAY TIME@"
 
-	db "@" ; unused
+.Unused: ; unreferenced
+	db "@"
 
 .Badges:
 	db "BADGES▶@"
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 6ef0a933..7ff23fce 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -719,7 +719,8 @@ IntroScene9:
 	db %00000000
 	db -1
 
-	ret ; unused
+Intro_DummyFunction: ; unreferenced
+	ret
 
 Intro_InitNote:
 	ld a, [wIntroSpriteStateFlag]
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index e1a7ebec..e13c2216 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -82,7 +82,7 @@ LoadMapObjects:
 	farcall InitializeVisibleSprites
 	ret
 
-; unused
+MapSetup_DummyFunction: ; unreferenced
 	ret
 
 ResetPlayerObjectAction:
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index a958429c..c18d3b46 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -311,7 +311,7 @@ DoPlayerMovement::
 	scf
 	ret
 
-; unused
+.unused ; unreferenced
 	xor a
 	ret
 
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 295ab35a..a97f7621 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -2087,7 +2087,8 @@ Script_writeunusedbytebuffer:
 	ld [wUnusedScriptByteBuffer], a
 	ret
 
-	db closetext_command ; unused
+UnusedClosetextScript: ; unreferenced
+	closetext
 
 Script_closetext:
 	ldh a, [hOAMUpdate]
@@ -2221,7 +2222,7 @@ ReturnFromCredits:
 	call StopScript
 	ret
 
-; unused
+Script_checkver_duplicate: ; unreferenced
 	ld a, [.gs_version]
 	ld [wScriptVar], a
 	ret
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm
index 5b4a96b5..a109a417 100644
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -175,12 +175,12 @@ CheckUnusedTwoDayTimer:
 	call UpdateTimeRemaining
 	ret
 
-; unused
+UnusedSetSwarmFlag: ; unreferenced
 	ld hl, wDailyFlags1
 	set DAILYFLAGS1_SWARM_F, [hl]
 	ret
 
-; unused
+UnusedCheckSwarmFlag: ; unreferenced
 	and a
 	ld hl, wDailyFlags1
 	bit DAILYFLAGS1_SWARM_F, [hl]
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 91875012..af0c3931 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -145,7 +145,7 @@ CheckPhoneCall::
 	farcall CheckReceiveCallTimer
 	ret
 
-; unused
+.unused ; unreferenced
 	ret
 
 FarInitCallReceiveDelay: ; unreferenced
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index f793e52e..e75af0cd 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -1257,7 +1257,7 @@ PokegearPhoneContactSubmenu:
 	dw .Call
 	dw .Cancel
 
-; unused
+GetAMPMHours: ; unreferenced
 	ldh a, [hHours]
 	cp 12
 	jr c, .am
@@ -1428,7 +1428,7 @@ UpdateRadioStation:
 	ldh [hBGMapMode], a
 	ret
 
-; unused
+LoadPokegearRadioChannelPointer: ; unreferenced
 	ld [wPokegearRadioChannelBank], a
 	ld a, [hli]
 	ld [wPokegearRadioChannelAddr], a
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index e02a0463..af266312 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -2453,7 +2453,7 @@ BillsPC_ChangeBoxSubmenu:
 	call CopyName2
 	ret
 
-	hlcoord 11, 7 ; unused
+	hlcoord 11, 7 ; unreferenced
 
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index e538a040..d6e962fe 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -327,7 +327,7 @@ EvolveAfterBattle_MasterLoop:
 	inc hl
 	jp .loop
 
-; unused
+.UnusedReturnToMap: ; unreferenced
 	pop hl
 .ReturnToMap:
 	pop de
diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index 578a9eea..384d2ad9 100644
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -1,9 +1,12 @@
-	db 0 ; unused
+DummyPredef3A_DummyData: ; unreferenced
+	db 0
 
 DummyPredef3A:
 	ret
 
-	ret ; unused
+DummyPredef3A_DummyFunction: ; unreferenced
+	ret
+
 
 _AnimateTileset::
 ; Iterate over a given pointer array of
@@ -754,4 +757,5 @@ WhirlpoolTiles2: INCBIN "gfx/tilesets/whirlpool/2.2bpp"
 WhirlpoolTiles3: INCBIN "gfx/tilesets/whirlpool/3.2bpp"
 WhirlpoolTiles4: INCBIN "gfx/tilesets/whirlpool/4.2bpp"
 
-	ret ; unused
+TilesetAnims_DummyFunction: ; unreferenced
+	ret