Replace many '; unused' with '; unreferenced'

30 files changed, 69 insertions, 55 deletions

diff --git a/audio/engine.asm b/audio/engine.asm
index bcd14ab8..d394067c 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1615,9 +1615,9 @@ Music_JumpIf:
 	ret
 
 MusicEE:
+; unused
 ; conditional jump
 ; checks a byte in ram corresponding to the current channel
-; doesn't seem to be set by any commands
 ; params: 2
 ;		ll hh ; pointer
 
@@ -1667,15 +1667,15 @@ MusicEE:
 	ret
 
 MusicF9:
+; unused
 ; sets some flag
-; seems to be unused
 ; params: 0
 	ld a, TRUE
 	ld [wUnusedMusicF9Flag], a
 	ret
 
 MusicE2:
-; seems to have been dummied out
+; unused
 ; params: 1
 	call GetMusicByte
 	ld hl, CHANNEL_FIELD2C
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm
index d5c044d7..d1f747a1 100644
--- a/data/battle/effect_command_pointers.asm
+++ b/data/battle/effect_command_pointers.asm
@@ -63,7 +63,7 @@ BattleCommandPointers:
 	dw BattleCommand_Charge
 	dw BattleCommand_CheckCharge
 	dw BattleCommand_TrapTarget
-	dw BattleCommand3c
+	dw BattleCommand_Unused3C
 	dw BattleCommand_Rampage
 	dw BattleCommand_CheckRampage
 	dw BattleCommand_ConstantDamage
@@ -96,7 +96,7 @@ BattleCommandPointers:
 	dw BattleCommand_Endure
 	dw BattleCommand_CheckCurl
 	dw BattleCommand_RolloutPower
-	dw BattleCommand5d
+	dw BattleCommand_Unused5D
 	dw BattleCommand_FuryCutter
 	dw BattleCommand_Attract
 	dw BattleCommand_HappinessPower
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 6104dbb7..4ae8d6b7 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -291,45 +291,45 @@ ENDC
 	frame SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2,  8, OAM_X_FLIP
 	dorestart
 
-; unused
+.Frameset_Unknown1: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_43,  8
 	frame SPRITE_ANIM_OAMSET_UNUSED_44,  8
 	dorestart
 
-; unused
+.Frameset_Unknown2: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_45,  8
 	frame SPRITE_ANIM_OAMSET_UNUSED_46,  8
 	dorestart
 
-; unused
+.Frameset_Unknown3: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_47,  8
 	frame SPRITE_ANIM_OAMSET_UNUSED_48,  8
 	dorestart
 
-; unused
+.Frameset_Unknown4: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1
 	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_X_FLIP
 	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_X_FLIP, OAM_Y_FLIP
 	frame SPRITE_ANIM_OAMSET_UNUSED_49,  1, OAM_Y_FLIP
 	dorestart
 
-; unused
+.Frameset_Unknown5: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32
 	endanim
 
-; unused
+.Frameset_Unknown6: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32
 	endanim
 
-; unused
+.Frameset_Unknown7: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32
 	endanim
 
-; unused
+.Frameset_Unknown8: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32
 	endanim
 
-; unused
+.Frameset_Unknown9: ; unreferenced
 	frame SPRITE_ANIM_OAMSET_UNUSED_4E,  3
 	dowait 3
 	dorestart
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 2af73fe0..d34d3a03 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -141,7 +141,7 @@ ENDC
 	dbsprite -1,  0,  0,  0, $00, 7 | Y_FLIP
 	dbsprite  0,  0,  0,  0, $00, 7 | X_FLIP | Y_FLIP
 
-; unused
+.OAMData_Unknown1: ; unreferenced
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0 | PRIORITY
 	dbsprite  0, -1,  0,  0, $00, 0 | X_FLIP | PRIORITY
@@ -265,7 +265,7 @@ ENDC
 	dbsprite  1,  0,  4,  4, $17, 0
 	dbsprite  1,  1,  4,  4, $18, 0
 
-; unused
+.OAMData_Unknown2: ; unreferenced
 	db 36
 	dbsprite -3, -3,  0,  0, $00, 0
 	dbsprite -2, -3,  0,  0, $01, 0
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
diff --git a/home/init.asm b/home/init.asm
index fc04cfd1..461937e4 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -161,11 +161,13 @@ ClearVRAM::
 
 BlankBGMap::
 	ld a, " "
-	jr .fill
-; unused; would fill BG Map with value in l
+	jr FillBGMap
+
+FillBGMap_l:: ; unreferenced
 	ld a, l
+	; fallthrough
 
-.fill
+FillBGMap::
 	ld de, vBGMap1 - vBGMap0
 	ld l, e
 .loop
diff --git a/home/map.asm b/home/map.asm
index 2701f477..cc2c4ddc 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2009,7 +2009,8 @@ GetMapEnvironment::
 	pop hl
 	ret
 
-	ret ; unused
+Map_DummyFunction:: ; unreferenced
+	ret
 
 GetAnyMapEnvironment::
 	push hl
diff --git a/home/menu.asm b/home/menu.asm
index 7bc6454d..5ba4cde9 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -294,7 +294,7 @@ MenuTextbox::
 	pop hl
 	jp PrintText
 
-; unused
+Menu_DummyFunction:: ; unreferenced
 	ret
 
 LoadMenuTextbox::
diff --git a/home/text.asm b/home/text.asm
index 5e2942f6..77b8911c 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -138,6 +138,7 @@ RadioTerminator::
 
 PrintText::
 	call SetUpTextbox
+	; fallthrough
 
 PrintTextboxText::
 	bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
@@ -154,6 +155,7 @@ SetUpTextbox::
 
 PlaceString::
 	push hl
+	; fallthrough
 
 PlaceNextChar::
 	ld a, [de]
@@ -164,7 +166,9 @@ PlaceNextChar::
 	pop hl
 	ret
 
-	pop de ; unused
+DummyChar:: ; unreferenced
+	pop de
+	; fallthrough
 
 NextChar::
 	inc de
@@ -301,12 +305,13 @@ PlaceKokoWa:  print_name PlaceKokoWaText
 PlaceMoveTargetsName::
 	ldh a, [hBattleTurn]
 	xor 1
-	jr PlaceMoveUsersName.place
+	jr PlaceBattlersName
 
 PlaceMoveUsersName::
 	ldh a, [hBattleTurn]
+	; fallthrough
 
-.place:
+PlaceBattlersName:
 	push de
 	and a
 	jr nz, .enemy
diff --git a/home/video.asm b/home/video.asm
index 415b23ae..a9592558 100644
--- a/home/video.asm
+++ b/home/video.asm
@@ -385,10 +385,10 @@ AnimateTileset::
 	rst Bankswitch
 	ret
 
-; unused
+Video_DummyFunction:: ; unreferenced
 	ret
 
-; unused
+EnableSpriteDisplay:: ; unreferenced
 	ld hl, rLCDC
 	set 1, [hl]
 	ret
diff --git a/home/window.asm b/home/window.asm
index c903cdd8..e8e0604d 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -92,6 +92,6 @@ SafeUpdateSprites::
 	ldh [hOAMUpdate], a
 	ret
 
-; unused
+SetCarryFlag:: ; unreferenced
 	scf
 	ret
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index fee872c5..abd9fe53 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -204,7 +204,8 @@ LakeOfRageMagikarpHouseUnusedRecordText:
 	text_ram wStringBuffer4
 	text_end
 
-	text_end ; unused
+LakeOfRageMagikarpHouseUnusedDummyText: ; unreferenced
+	text_end
 
 LakeOfRageMagikarpHouse_MapEvents:
 	db 0, 0 ; filler
diff --git a/maps/Route25.asm b/maps/Route25.asm
index a20cb3f2..4ddb215f 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -423,7 +423,7 @@ BillsHouseSignText:
 	line "BILL'S HOUSE"
 	done
 
-; unused
+UnusedBillsHouseSignText: ; unreferenced
 	text "BILL'S HOUSE"
 	done
 
diff --git a/maps/Route34.asm b/maps/Route34.asm
index b545c927..747ff561 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -603,7 +603,6 @@ CooltrainerfKateAfterText:
 	done
 
 Route34IlexForestSignText:
-; unused
 	text "ILEX FOREST"
 	line "Through the Gate"
 	done
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index a3312842..a29c9d3b 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -301,7 +301,6 @@ RuinsOfAlphResearchCenterUnownPrinterText:
 	done
 
 RuinsOfAlphResearchCenterProfSilktreePhotoText:
-; unused
 	text "It's a photo of"
 	line "the RESEARCH"