Comment, remove, or revise many unreferenced labels

audio/cries.asm

@@ -464,7 +464,7 @@ Cry_Sentret_Ch6:
 	square_note 8, 15, 1, 1824
 	sound_ret
 
-Cry_Sentret_Ch8:
+Cry_Sentret_Ch8: ; unreferenced
 	noise_note 8, 3, -3, 0
 	noise_note 8, 9, 2, 0
 	sound_ret
@@ -1082,7 +1082,7 @@ Cry_Weepinbell:
 	channel 6, Cry_Weepinbell_Ch6
 	channel 8, Cry_Weepinbell_Ch8
 
-Cry_Unused_Ch5:
+Cry_Unused_Ch5: ; unreferenced
 	duty_cycle_pattern 3, 3, 0, 0
 	square_note 15, 14, 0, 1920
 	square_note 15, 15, 0, 1924
@@ -1092,7 +1092,7 @@ Cry_Unused_Ch5:
 	square_note 8, 7, 1, 1924
 	sound_ret
 
-Cry_Unused_Ch6:
+Cry_Unused_Ch6: ; unreferenced
 	duty_cycle_pattern 0, 0, 1, 1
 	square_note 15, 10, 0, 1857
 	square_note 15, 11, 0, 1859
@@ -1102,7 +1102,7 @@ Cry_Unused_Ch6:
 	square_note 8, 3, 1, 1862
 	sound_ret
 
-Cry_Unused_Ch8:
+Cry_Unused_Ch8: ; unreferenced
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 0, 58
 	noise_note 15, 13, 0, 58

audio/engine.asm

@@ -38,15 +38,16 @@ _InitSound::
 	dec e
 	jr nz, .clearsound
 
-	ld hl, wChannels ; start of channel data
-	ld de, wChannelsEnd - wChannels ; length of area to clear (entire sound wram area)
-.clearchannels
+	ld hl, wAudio
+	ld de, wAudioEnd - wAudio
+.clearaudio
 	xor a
 	ld [hli], a
 	dec de
 	ld a, e
 	or d
-	jr nz, .clearchannels
+	jr nz, .clearaudio
+
 	ld a, MAX_VOLUME
 	ld [wVolume], a
 	call MusicOn

audio/music/magnettrain.asm

@@ -246,7 +246,7 @@ Music_MagnetTrain_Ch4:
 	drum_note 12, 16
 	sound_ret
 
-.sub1: ; unused
+.sub1: ; unreferenced
 	drum_note 9, 1
 	drum_note 8, 1
 	drum_note 8, 1

audio/sfx.asm

@@ -21,7 +21,7 @@ Sfx_Menu:
 Sfx_ReadText:
 Sfx_ReadText2:
 	channel_count 1
-	channel 5, Sfx_ReadText2_Ch5
+	channel 5, Sfx_ReadText_Ch5 ; aka Sfx_ReadText2_Ch5
 
 Sfx_Poison:
 	channel_count 1
@@ -466,7 +466,7 @@ Sfx_Unknown5F:
 	channel 5, Sfx_Unknown5F_Ch5
 	channel 6, Sfx_Unknown5F_Ch6
 Sfx_Sandstorm:
-	channel 8, Sfx_Sandstorm_Ch8
+	channel 8, Sfx_Sandstorm_Ch8 ; aka Sfx_Unknown5F_Ch8
 
 Sfx_HangUp:
 	channel_count 1
@@ -486,10 +486,10 @@ Sfx_Elevator:
 Sfx_LevelUp:
 Sfx_DexFanfare5079:
 	channel_count 4
-	channel 5, Sfx_LevelUp_Ch5
-	channel 6, Sfx_LevelUp_Ch6
-	channel 7, Sfx_LevelUp_Ch7
-	channel 8, Sfx_LevelUp_Ch8
+	channel 5, Sfx_LevelUp_Ch5 ; aka Sfx_DexFanfare5079_Ch5
+	channel 6, Sfx_LevelUp_Ch6 ; aka Sfx_DexFanfare5079_Ch6
+	channel 7, Sfx_LevelUp_Ch7 ; aka Sfx_DexFanfare5079_Ch7
+	channel 8, Sfx_LevelUp_Ch8 ; aka Sfx_DexFanfare5079_Ch8
 
 Sfx_LevelUp_Ch5:
 Sfx_DexFanfare5079_Ch5:
@@ -942,7 +942,7 @@ Sfx_Fanfare2:
 	channel 6, Sfx_Fanfare2_Ch6
 	channel 8, Sfx_Fanfare2_Ch8
 
-Sfx_Unused:
+Sfx_Unused: ; unreferenced
 	channel_count 4
 	channel 5, Sfx_Unused_Ch5
 	channel 6, Sfx_Unused_Ch6

audio/sfx_pointers.asm

@@ -144,7 +144,7 @@ SFX:
 	dba Sfx_MilkDrink
 	dba Sfx_Present
 	dba Sfx_MorningSun
-	dba Sfx_LevelUp
+	dba Sfx_LevelUp ; aka Sfx_DexFanfare5079
 	dba Sfx_KeyItem
 	dba Sfx_Fanfare2
 	dba Sfx_RegisterPhoneNumber

constants/map_constants.asm

@@ -1,5 +1,5 @@
 newgroup: MACRO
-const_value = const_value + 1
+	const_skip
 __map_value__ = 1
 ENDM
 

constants/map_data_constants.asm

@@ -66,7 +66,7 @@ NUM_MAP_PALETTES EQU const_value
 	shift_const NORTH
 
 ; SpawnPoints indexes (see data/maps/spawn_points.asm)
-const_value = -1
+	const_def -1
 	const SPAWN_N_A
 	const SPAWN_HOME
 	const SPAWN_DEBUG

constants/pokemon_data_constants.asm

@@ -160,7 +160,7 @@ NUM_TREEMON_SETS EQU const_value
 	const TREEMON_SCORE_RARE ; 2
 
 ; ChangeHappiness arguments (see data/happiness_changes.asm)
-const_value = 1
+	const_def 1
 	const HAPPINESS_GAINLEVEL         ; 01
 	const HAPPINESS_USEDITEM          ; 02
 	const HAPPINESS_USEDXITEM         ; 03
@@ -179,7 +179,6 @@ const_value = 1
 	const HAPPINESS_ENERGYROOT        ; 10
 	const HAPPINESS_REVIVALHERB       ; 11
 	const HAPPINESS_GROOMING          ; 12
-	const HAPPINESS_GAINLEVELATHOME   ; 13
 
 ; significant happiness values
 BASE_HAPPINESS        EQU 70

constants/trainer_constants.asm

@@ -3,7 +3,7 @@ __trainer_class__ = 0
 trainerclass: MACRO
 \1 EQU __trainer_class__
 __trainer_class__ = __trainer_class__ + 1
-const_value = 1
+	const_def 1
 ENDM
 
 ; trainer class ids

data/decorations/decorations.asm

@@ -48,7 +48,8 @@ DecorationIDs:
 	db DECO_BIG_SNORLAX_DOLL ; 1a
 	db DECO_BIG_ONIX_DOLL ; 1b
 	db DECO_BIG_LAPRAS_DOLL ; 1c
-TrophyIDs:
+
 	db DECO_GOLD_TROPHY_DOLL ; 33
 	db DECO_SILVER_TROPHY_DOLL ; 34
-	db -1
+
+	db -1 ; end

data/maps/blocks.asm

@@ -15,7 +15,7 @@ Route44_Blocks:
 Route28_Blocks:
 	INCBIN "maps/Route28.blk"
 
-BetaPlayersHouse2F_Blocks:
+BetaPlayersHouse2F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaPlayersHouse2F.blk"
 
 CeladonCity_Blocks:
@@ -30,25 +30,25 @@ Route2_Blocks:
 ElmsHouse_Blocks:
 	INCBIN "maps/ElmsHouse.blk"
 
-BetaSproutTower1_Blocks:
+BetaSproutTower1_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower1.blk"
 
 Route11_Blocks:
 	INCBIN "maps/Route11.blk"
 
-BetaSproutTower5_Blocks:
+BetaSproutTower5_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower5.blk"
 
 Route15_Blocks:
 	INCBIN "maps/Route15.blk"
 
-BetaSproutTower9_Blocks:
+BetaSproutTower9_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower9.blk"
 
 Route19_Blocks:
 	INCBIN "maps/Route19.blk"
 
-BetaBlackthornCity_Blocks:
+BetaBlackthornCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaBlackthornCity.blk"
 
 Route10South_Blocks:
@@ -94,7 +94,7 @@ Route25_Blocks:
 Route24_Blocks:
 	INCBIN "maps/Route24.blk"
 
-BetaVioletCity_Blocks:
+BetaVioletCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaVioletCity.blk"
 
 Route3_Blocks:
@@ -103,25 +103,25 @@ Route3_Blocks:
 PewterCity_Blocks:
 	INCBIN "maps/PewterCity.blk"
 
-BetaSilverCaveOutside_Blocks:
+BetaSilverCaveOutside_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSilverCaveOutside.blk"
 
-BetaSproutTower2_Blocks:
+BetaSproutTower2_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower2.blk"
 
 Route12_Blocks:
 	INCBIN "maps/Route12.blk"
 
-BetaGoldenrodCity_Blocks:
+BetaGoldenrodCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaGoldenrodCity.blk"
 
 Route20_Blocks:
 	INCBIN "maps/Route20.blk"
 
-BetaSproutTower6_Blocks:
+BetaSproutTower6_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower6.blk"
 
-BetaPokecenter_Blocks:
+BetaPokecenter_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaPokecenter.blk"
 
 Route30_Blocks:
@@ -145,7 +145,7 @@ FuchsiaCity_Blocks:
 Route38_Blocks:
 	INCBIN "maps/Route38.blk"
 
-BetaCianwoodCity_Blocks:
+BetaCianwoodCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCianwoodCity.blk"
 
 OlivineTimsHouse_Blocks:
@@ -214,10 +214,10 @@ Route29Route46Gate_Blocks:
 Route5SaffronGate_Blocks:
 	INCBIN "maps/NorthSouthGate.blk"
 
-BetaEcruteakCity_Blocks:
+BetaEcruteakCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaEcruteakCity.blk"
 
-BetaCherrygroveCity_Blocks:
+BetaCherrygroveCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCherrygroveCity.blk"
 
 CinnabarIsland_Blocks:
@@ -229,7 +229,7 @@ Route4_Blocks:
 Route8_Blocks:
 	INCBIN "maps/Route8.blk"
 
-BetaSproutTower3_Blocks:
+BetaSproutTower3_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower3.blk"
 
 ViridianCity_Blocks:
@@ -241,13 +241,13 @@ Route13_Blocks:
 Route21_Blocks:
 	INCBIN "maps/Route21.blk"
 
-BetaSproutTower7_Blocks:
+BetaSproutTower7_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower7.blk"
 
 Route17_Blocks:
 	INCBIN "maps/Route17.blk"
 
-BetaMahoganyTown_Blocks:
+BetaMahoganyTown_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaMahoganyTown.blk"
 
 Route31_Blocks:
@@ -280,16 +280,16 @@ Route17Route18Gate_Blocks:
 Route31VioletGate_Blocks:
 	INCBIN "maps/EastWestGate.blk"
 
-BetaAzaleaTown_Blocks:
+BetaAzaleaTown_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaAzaleaTown.blk"
 
 VermilionCity_Blocks:
 	INCBIN "maps/VermilionCity.blk"
 
-BetaOlivineCity_Blocks:
+BetaOlivineCity_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaOlivineCity.blk"
 
-BetaNewBarkTown_Blocks:
+BetaNewBarkTown_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaNewBarkTown.blk"
 
 ElmsLab_Blocks:
@@ -316,7 +316,7 @@ SECTION "Map Blocks 2", ROMX
 Route14_Blocks:
 	INCBIN "maps/Route14.blk"
 
-BetaSproutTower8_Blocks:
+BetaSproutTower8_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTower8.blk"
 
 OlivineMart_Blocks:
@@ -337,7 +337,7 @@ CherrygroveMart_Blocks:
 Route10North_Blocks:
 	INCBIN "maps/Route10North.blk"
 
-BetaLakeOfRage_Blocks:
+BetaLakeOfRage_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaLakeOfRage.blk"
 
 OlivinePokecenter1F_Blocks:
@@ -363,25 +363,25 @@ SaffronPokecenter1F_Blocks:
 CherrygrovePokecenter1F_Blocks:
 	INCBIN "maps/Pokecenter1F.blk"
 
-BetaPewterMuseumOfScience1F_Blocks:
+BetaPewterMuseumOfScience1F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaPewterMuseumOfScience1F.blk"
 
-BetaPewterMuseumOfScience2F_Blocks:
+BetaPewterMuseumOfScience2F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaPewterMuseumOfScience2F.blk"
 
 EarlsPokemonAcademy_Blocks:
 	INCBIN "maps/EarlsPokemonAcademy.blk"
 
-BetaCinnabarPokemonLabHallway_Blocks:
+BetaCinnabarPokemonLabHallway_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCinnabarPokemonLabHallway.blk"
 
-BetaCinnabarPokemonLabRoom1_Blocks:
+BetaCinnabarPokemonLabRoom1_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom1.blk"
 
-BetaCinnabarPokemonLabRoom2_Blocks:
+BetaCinnabarPokemonLabRoom2_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom2.blk"
 
-BetaCinnabarPokemonLabRoom3_Blocks:
+BetaCinnabarPokemonLabRoom3_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCinnabarPokemonLabRoom3.blk"
 
 GoldenrodDeptStore1F_Blocks:
@@ -424,7 +424,7 @@ CeladonMansion3F_Blocks:
 CeladonMansionRoof_Blocks:
 	INCBIN "maps/CeladonMansionRoof.blk"
 
-BetaHouse_Blocks:
+BetaHouse_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaHouse.blk"
 
 CeladonGameCorner_Blocks:
@@ -446,7 +446,7 @@ VioletNicknameSpeechHouse_Blocks:
 VioletKylesHouse_Blocks:
 	INCBIN "maps/House2.blk"
 
-BetaUnionCave_Blocks:
+BetaUnionCave_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaUnionCave.blk"
 
 UnionCaveB1F_Blocks:
@@ -466,7 +466,7 @@ Route5UndergroundPathEntrance_Blocks:
 Route6UndergroundPathEntrance_Blocks:
 	INCBIN "maps/UndergroundPathEntrance.blk"
 
-BetaCapsuleHouse_Blocks:
+BetaCapsuleHouse_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCapsuleHouse.blk"
 
 KurtsHouse_Blocks:
@@ -478,7 +478,7 @@ GoldenrodMagnetTrainStation_Blocks:
 RuinsOfAlphOutside_Blocks:
 	INCBIN "maps/RuinsOfAlphOutside.blk"
 
-BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks:
+BetaRuinsOfAlphUnsolvedPuzzleRoom_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRuinsOfAlphUnsolvedPuzzleRoom.blk"
 
 RuinsOfAlphHoOhChamber_Blocks:
@@ -493,19 +493,19 @@ RuinsOfAlphInnerChamber_Blocks:
 SproutTower1F_Blocks:
 	INCBIN "maps/SproutTower1F.blk"
 
-BetaSproutTowerCutOut1_Blocks:
+BetaSproutTowerCutOut1_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTowerCutOut1.blk"
 
 SproutTower2F_Blocks:
 	INCBIN "maps/SproutTower2F.blk"
 
-BetaSproutTowerCutOut2_Blocks:
+BetaSproutTowerCutOut2_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTowerCutOut2.blk"
 
 SproutTower3F_Blocks:
 	INCBIN "maps/SproutTower3F.blk"
 
-BetaSproutTowerCutOut3_Blocks:
+BetaSproutTowerCutOut3_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSproutTowerCutOut3.blk"
 
 RadioTower1F_Blocks:
@@ -583,7 +583,7 @@ GoldenrodDeptStoreB1F_Blocks:
 GoldenrodUndergroundWarehouse_Blocks:
 	INCBIN "maps/GoldenrodUndergroundWarehouse.blk"
 
-BetaElevator_Blocks:
+BetaElevator_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaElevator.blk"
 
 TinTower1F_Blocks:
@@ -622,7 +622,7 @@ BurnedTower1F_Blocks:
 BurnedTowerB1F_Blocks:
 	INCBIN "maps/BurnedTowerB1F.blk"
 
-BetaCaveTestMap_Blocks:
+BetaCaveTestMap_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCaveTestMap.blk"
 
 MountMortar1FOutside_Blocks:
@@ -685,16 +685,16 @@ SilverCaveRoom2_Blocks:
 SilverCaveRoom3_Blocks:
 	INCBIN "maps/SilverCaveRoom3.blk"
 
-BetaRocketHideoutB2F_Blocks:
+BetaRocketHideoutB2F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRocketHideoutB2F.blk"
 
-BetaRocketHideoutB1F_Blocks:
+BetaRocketHideoutB1F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRocketHideoutB1F.blk"
 
-BetaRocketHideout1F_Blocks:
+BetaRocketHideout1F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRocketHideout1F.blk"
 
-BetaRocketHideoutB3F_Blocks:
+BetaRocketHideoutB3F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRocketHideoutB3F.blk"
 
 MahoganyMart1F_Blocks:
@@ -710,7 +710,7 @@ TeamRocketBaseB2F_Blocks:
 TeamRocketBaseB3F_Blocks:
 	INCBIN "maps/TeamRocketBaseB3F.blk"
 
-BetaRoute23_Blocks:
+BetaRoute23_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaRoute23.blk"
 
 IndigoPlateauPokecenter1F_Blocks:
@@ -746,7 +746,7 @@ MahoganyGym_Blocks:
 OlivineGym_Blocks:
 	INCBIN "maps/OlivineGym.blk"
 
-BetaUnknownGym_Blocks:
+BetaUnknownGym_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaUnknownGym.blk"
 
 CianwoodGym_Blocks:
@@ -779,7 +779,7 @@ OlivineLighthouse6F_Blocks:
 
 SECTION "Map Blocks 3", ROMX
 
-BetaSlowpokeWell1F_Blocks:
+BetaSlowpokeWell1F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaSlowpokeWell1F.blk"
 
 SlowpokeWellB1F_Blocks:
@@ -824,7 +824,7 @@ FastShip1F_Blocks:
 FastShipB1F_Blocks:
 	INCBIN "maps/FastShipB1F.blk"
 
-BetaFastShipInsideCutOut_Blocks:
+BetaFastShipInsideCutOut_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaFastShipInsideCutOut.blk"
 
 FastShipCabins_NNW_NNE_NE_Blocks:
@@ -913,13 +913,13 @@ PewterGym_Blocks:
 CeladonGym_Blocks:
 	INCBIN "maps/CeladonGym.blk"
 
-BetaCeladonMansion1F_Blocks:
+BetaCeladonMansion1F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCeladonMansion1F.blk"
 
 CeladonCafe_Blocks:
 	INCBIN "maps/CeladonCafe.blk"
 
-BetaCeladonMansion2F_Blocks:
+BetaCeladonMansion2F_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaCeladonMansion2F.blk"
 
 RockTunnel1F_Blocks:

data/maps/landmarks.asm

@@ -127,7 +127,7 @@ WhirlIslandsName:    db "WHIRL¯ISLANDS@"
 MtMortarName:        db "MT.MORTAR@"
 DragonsDenName:      db "DRAGON'S¯DEN@"
 IcePathName:         db "ICE PATH@"
-NotApplicableName:   db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
+NotApplicableName:   db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
 PalletTownName:      db "PALLET TOWN@"
 ViridianCityName:    db "VIRIDIAN¯CITY@"
 PewterCityName:      db "PEWTER CITY@"
@@ -143,11 +143,11 @@ VictoryRoadName:     db "VICTORY¯ROAD@"
 MtMoonName:          db "MT.MOON@"
 RockTunnelName:      db "ROCK TUNNEL@"
 LavRadioTowerName:   db "LAV¯RADIO TOWER@"
-SilphCoName:         db "SILPH CO.@"
-SafariZoneName:      db "SAFARI ZONE@"
+SilphCoName:         db "SILPH CO.@" ; unreferenced
+SafariZoneName:      db "SAFARI ZONE@" ; unreferenced
 SeafoamIslandsName:  db "SEAFOAM¯ISLANDS@"
-PokemonMansionName:  db "#MON¯MANSION@"
-CeruleanCaveName:    db "CERULEAN¯CAVE@"
+PokemonMansionName:  db "#MON¯MANSION@" ; unreferenced
+CeruleanCaveName:    db "CERULEAN¯CAVE@" ; unreferenced
 Route1Name:          db "ROUTE 1@"
 Route2Name:          db "ROUTE 2@"
 Route3Name:          db "ROUTE 3@"
@@ -198,7 +198,7 @@ DarkCaveName:        db "DARK CAVE@"
 IlexForestName:      db "ILEX¯FOREST@"
 BurnedTowerName:     db "BURNED¯TOWER@"
 FastShipName:        db "FAST SHIP@"
-ViridianForestName:  db "VIRIDIAN¯FOREST@"
+ViridianForestName:  db "VIRIDIAN¯FOREST@" ; unreferenced
 DiglettsCaveName:    db "DIGLETT's¯CAVE@"
 TohjoFallsName:      db "TOHJO FALLS@"
 UndergroundName:     db "UNDERGROUND@"

data/moves/animations.asm

@@ -481,7 +481,7 @@ BattleAnim_SendOutMon:
 
 BattleAnim_ReturnMon:
 	anim_sound 0, 0, SFX_BALL_POOF
-.anim:
+BattleAnimSub_Return:
 	anim_bgeffect ANIM_BG_RETURN_MON, $0, BG_EFFECT_USER, $0
 	anim_wait 32
 	anim_ret
@@ -1314,7 +1314,7 @@ BattleAnim_RazorWind:
 	anim_wait 24
 	anim_ret
 
-BattleAnim_Sonicboom_JP:
+BattleAnim_Sonicboom_JP: ; unreferenced
 	anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT
 .loop
 	anim_sound 3, 0, SFX_RAZOR_WIND
@@ -4104,7 +4104,7 @@ BattleAnim_BatonPass:
 	anim_1gfx ANIM_GFX_MISC
 	anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20
 	anim_sound 0, 0, SFX_BATON_PASS
-	anim_call BattleAnim_ReturnMon.anim
+	anim_call BattleAnimSub_Return
 	anim_wait 64
 	anim_ret
 

data/phone/text/elm.asm

@@ -197,7 +197,6 @@ ElmPhoneGiftText:
 	para "See you later!"
 	done
 
-; unused
 ElmPhoneGotAholdOfSomethingNeatText:
 	text "Hello, <PLAYER>?"
 	line "How's it going?"

data/phone/text/landmarks.asm

@@ -1,67 +1,22 @@
-PhoneNationalParkText:
-	db "NATIONAL PARK@"
-
-PhoneLighthouseText:
-	db "LIGHTHOUSE@"
-
-; unreferenced
-PhoneUndergroundText:
-	db "UNDERGROUND@"
-
-PhoneDarkCaveText:
-	db "DARK CAVE@"
-
-PhoneMtMortarText:
-	db "MT.MORTAR@"
-
-PhoneRoute26Text:
-	db "ROUTE 26@"
-
-PhoneRoute27Text:
-	db "ROUTE 27@"
-
-PhoneRoute30Text:
-	db "ROUTE 30@"
-
-PhoneRoute31Text:
-	db "ROUTE 31@"
-
-PhoneRoute32Text:
-	db "ROUTE 32@"
-
-PhoneRoute33Text:
-	db "ROUTE 33@"
-
-PhoneRoute34Text:
-	db "ROUTE 34@"
-
-PhoneRoute35Text:
-	db "ROUTE 35@"
-
-PhoneRoute36Text:
-	db "ROUTE 36@"
-
-; unreferenced
-PhoneRoute37Text:
-	db "ROUTE 37@"
-
-PhoneRoute38Text:
-	db "ROUTE 38@"
-
-PhoneRoute39Text:
-	db "ROUTE 39@"
-
-PhoneRoute42Text:
-	db "ROUTE 42@"
-
-PhoneRoute43Text:
-	db "ROUTE 43@"
-
-PhoneRoute44Text:
-	db "ROUTE 44@"
-
-PhoneRoute45Text:
-	db "ROUTE 45@"
-
-PhoneRoute46Text:
-	db "ROUTE 46@"
+PhoneNationalParkText: db "NATIONAL PARK@"
+PhoneLighthouseText:   db "LIGHTHOUSE@"
+PhoneUndergroundText:  db "UNDERGROUND@" ; unreferenced
+PhoneDarkCaveText:     db "DARK CAVE@"
+PhoneMtMortarText:     db "MT.MORTAR@"
+PhoneRoute26Text:      db "ROUTE 26@"
+PhoneRoute27Text:      db "ROUTE 27@"
+PhoneRoute30Text:      db "ROUTE 30@"
+PhoneRoute31Text:      db "ROUTE 31@"
+PhoneRoute32Text:      db "ROUTE 32@"
+PhoneRoute33Text:      db "ROUTE 33@"
+PhoneRoute34Text:      db "ROUTE 34@"
+PhoneRoute35Text:      db "ROUTE 35@"
+PhoneRoute36Text:      db "ROUTE 36@"
+PhoneRoute37Text:      db "ROUTE 37@" ; unreferenced
+PhoneRoute38Text:      db "ROUTE 38@"
+PhoneRoute39Text:      db "ROUTE 39@"
+PhoneRoute42Text:      db "ROUTE 42@"
+PhoneRoute43Text:      db "ROUTE 43@"
+PhoneRoute44Text:      db "ROUTE 44@"
+PhoneRoute45Text:      db "ROUTE 45@"
+PhoneRoute46Text:      db "ROUTE 46@"

data/sprite_anims/oam.asm

@@ -762,7 +762,7 @@ ELIF DEF(_SILVER)
 	dbsprite  3, -2,  0,  0, $1c, 0
 	dbsprite  4, -2,  0,  0, $1e, 0
 
-.OAMData_GSIntroLugia3:
+.OAMData_GSIntroLugia3: ; unreferenced
 	db 17
 	dbsprite -5, -2,  0,  0, $3c, 0
 	dbsprite -5,  0,  0,  0, $3e, 0
@@ -782,7 +782,7 @@ ELIF DEF(_SILVER)
 	dbsprite  3, -1,  0,  0, $56, 0
 	dbsprite  4, -1,  0,  0, $58, 0
 
-.OAMData_GSIntroLugia4:
+.OAMData_GSIntroLugia4: ; unreferenced
 	db 17
 	dbsprite -5, -2,  0,  0, $5a, 0
 	dbsprite -5,  0,  0,  0, $5c, 0
@@ -802,8 +802,7 @@ ELIF DEF(_SILVER)
 	dbsprite  3, -1,  0,  0, $74, 0
 	dbsprite  4, -1,  0,  0, $76, 0
 
-; unused / copy of intro4
-.OAMData_GSIntroLugia5:
+.OAMData_GSIntroLugia5: ; unreferenced
 	db 17
 	dbsprite -5, -2,  0,  0, $5a, 0
 	dbsprite -5,  0,  0,  0, $5c, 0

data/text/common_2.asm

@@ -160,7 +160,6 @@ _RodNothingText::
 	text "Not even a nibble!"
 	prompt
 
-; unreferenced
 _UnusedNothingHereText::
 	text "Looks like there's"
 	line "nothing here."

data/text/unused_sweet_honey.asm

@@ -8,7 +8,7 @@
 ; Most of these texts seem to be associated with a single NPC.
 ; The last text is associated with a second NPC, probably a Butterfree.
 
-UnusedSweetHoneyText:
+UnusedSweetHoneyText: ; unreferenced
 	text "My #MON is an"
 	line "expert at collect-"
 	cont "ing SWEET HONEY."
@@ -17,7 +17,7 @@ UnusedSweetHoneyText:
 	line "with you."
 	done
 
-UnusedSweetHoneyBagFullText:
+UnusedSweetHoneyBagFullText: ; unreferenced
 	text "I want to give you"
 	line "some SWEET HONEY,"
 
@@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText:
 	line "room for it."
 	done
 
-UnusedSweetHoneyGiveText:
+UnusedSweetHoneyGiveText: ; unreferenced
 	text "Here you go! Have"
 	line "some SWEET HONEY!"
 	done
 
-UnusedGotSweetHoneyText:
+UnusedGotSweetHoneyText: ; unreferenced
 	text "<PLAYER> received"
 	line "SWEET HONEY."
 	done
 
-UnusedSweetHoneyAfterText1:
+UnusedSweetHoneyAfterText1: ; unreferenced
 	text "My little brother"
 	line "takes SWEET HONEY"
 
@@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1:
 	line "up to?"
 	done
 
-UnusedSweetHoneyAfterText2:
+UnusedSweetHoneyAfterText2: ; unreferenced
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2:
 	line "it?"
 	done
 
-UnusedSweetHoneyAfterText3:
+UnusedSweetHoneyAfterText3: ; unreferenced
 	text "Did you put SWEET"
 	line "HONEY on a tree?"
 
@@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3:
 	cont "be drawn to it."
 	done
 
-UnusedSweetHoneyButterfreeText:
+UnusedSweetHoneyButterfreeText: ; unreferenced
 	text "BUTTERFREE: Freeh!"
 	done

engine/battle/ai/items.asm

@@ -25,7 +25,7 @@ AI_SwitchOrTryItem:
 	ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
 	ld bc, NUM_TRAINER_ATTRIBUTES
 	call AddNTimes
-.ok
+
 	bit SWITCH_OFTEN_F, [hl]
 	jp nz, SwitchOften
 	bit SWITCH_RARELY_F, [hl]
@@ -141,7 +141,7 @@ SwitchSometimes:
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
 
-CheckSubstatusCantRun:
+CheckSubstatusCantRun: ; unreferenced
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_CANT_RUN, a
 	ret
@@ -204,7 +204,7 @@ AI_TryItem:
 	inc hl
 	jr c, .loop
 
-.used_item
+; used item
 	xor a
 	ld [de], a
 	inc a
@@ -247,7 +247,7 @@ AI_TryItem:
 	cp e
 	jr nc, .yes
 
-.no
+.no ; unreferenced
 	and a
 	ret
 

engine/battle/battle_transition.asm

@@ -396,7 +396,7 @@ ENDM
 	spin_quadrant LOWER_LEFT,  .wedge1,  1, 11
 	db -1
 
-.load
+.load:
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]

engine/battle/core.asm

@@ -1644,7 +1644,7 @@ HandleWeather:
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first
 
-.player_first
+; player first
 	call SetPlayerTurn
 	call .SandstormDamage
 	call SetEnemyTurn
@@ -2609,7 +2609,7 @@ AskUseNextPokemon:
 ForcePlayerMonChoice:
 	call EmptyBattleTextbox
 	call LoadStandardMenuHeader
-	call SetUpBattlePartyMenu_NoLoop
+	call SetUpBattlePartyMenu
 	call ForcePickPartyMonInBattle
 	ld a, [wLinkMode]
 	cp LINK_COLOSSEUM
@@ -2681,9 +2681,8 @@ PlayerPartyMonEntrance:
 	call SetPlayerTurn
 	jp SpikesDamage
 
-SetUpBattlePartyMenu_NoLoop:
+SetUpBattlePartyMenu:
 	call ClearBGPalettes
-SetUpBattlePartyMenu: ; switch to fullscreen menu?
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
@@ -3296,7 +3295,7 @@ OfferSwitch:
 	ld a, [wMenuCursorY]
 	dec a
 	jr nz, .said_no
-	call SetUpBattlePartyMenu_NoLoop
+	call SetUpBattlePartyMenu
 	call PickSwitchMonInBattle
 	jr c, .canceled_switch
 	ld a, [wCurBattleMon]
@@ -8005,7 +8004,7 @@ CheckPayDay:
 	call StdBattleTextbox
 	ret
 
-PlayerPickedUpPayDayMoney:
+PlayerPickedUpPayDayMoney: ; unreferenced
 	text_far _PlayerPickedUpPayDayMoney
 	text_end
 
@@ -8180,7 +8179,6 @@ ReadAndPrintLinkBattleRecord:
 	lb bc, 2, 4
 	call PrintNum
 
-.quit
 	ret
 
 .PrintZerosIfNoSaveFileExists:
@@ -8556,14 +8554,15 @@ InitBattleDisplay:
 	call OpenSRAM
 
 	ld hl, sDecompressScratch
-	ld bc, sScratchAttrmap - sDecompressScratch
+	ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT
 	ld a, " "
 	call ByteFill
 
 	ld de, sDecompressScratch
 	hlbgcoord 0, 0
-	lb bc, BANK(.BlankBGMap), $40
+	lb bc, BANK(@), (BG_MAP_WIDTH * BG_MAP_HEIGHT) / LEN_2BPP_TILE
 	call Request2bpp
+
 	call CloseSRAM
 	ret
 

engine/battle/effect_commands.asm

@@ -145,7 +145,7 @@ BattleCommand_CheckTurn:
 	and a
 	jp nz, CheckEnemyTurn
 
-CheckPlayerTurn:
+; check player turn
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@@ -2592,7 +2592,7 @@ PlayerAttackDamage:
 	cp SPECIAL
 	jr nc, .special
 
-.physical
+; physical
 	ld hl, wEnemyMonDefense
 	ld a, [hli]
 	ld b, a
@@ -2660,7 +2660,6 @@ PlayerAttackDamage:
 	ret
 
 TruncateHL_BC:
-.loop
 ; Truncate 16-bit values hl and bc to 8-bit values b and c respectively.
 ; b = hl, c = bc
 
@@ -2821,9 +2820,9 @@ EnemyAttackDamage:
 
 	ld a, [hl]
 	cp SPECIAL
-	jr nc, .Special
+	jr nc, .special
 
-.physical
+; physical
 	ld hl, wBattleMonDefense
 	ld a, [hli]
 	ld b, a
@@ -2847,7 +2846,7 @@ EnemyAttackDamage:
 	ld hl, wEnemyAttack
 	jr .thickclub
 
-.Special:
+.special
 	ld hl, wBattleMonSpclDef
 	ld a, [hli]
 	ld b, a
@@ -6075,7 +6074,7 @@ INCLUDE "engine/battle/move_effects/conversion.asm"
 BattleCommand_ResetStats:
 ; resetstats
 
-	ld a, 7 ; neutral
+	ld a, BASE_STAT_LEVEL
 	ld hl, wPlayerStatLevels
 	call .Fill
 	ld hl, wEnemyStatLevels
@@ -6098,7 +6097,7 @@ BattleCommand_ResetStats:
 	jp StdBattleTextbox
 
 .Fill:
-	ld b, wPlayerStatLevelsEnd - wPlayerStatLevels
+	ld b, NUM_LEVEL_STATS
 .next
 	ld [hli], a
 	dec b

engine/battle/menu.asm

@@ -3,8 +3,7 @@ LoadBattleMenu:
 	call LoadMenuHeader
 	jr CommonBattleMenu
 
-SafariBattleMenu:
-; untranslated
+SafariBattleMenu: ; unreferenced
 	ld hl, SafariBattleMenuHeader
 	call LoadMenuHeader
 	jr CommonBattleMenu
@@ -12,7 +11,8 @@ SafariBattleMenu:
 ContestBattleMenu:
 	ld hl, ContestBattleMenuHeader
 	call LoadMenuHeader
-; fallthrough
+	; fallthrough
+
 CommonBattleMenu:
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a

engine/battle/move_effects/baton_pass.asm

@@ -17,7 +17,7 @@ BattleCommand_BatonPass:
 
 ; Transition into switchmon menu
 	call LoadStandardMenuHeader
-	farcall SetUpBattlePartyMenu_NoLoop
+	farcall SetUpBattlePartyMenu
 
 	farcall ForcePickSwitchMonInBattle
 

engine/battle_anims/anim_commands.asm

@@ -978,7 +978,7 @@ GetMinimizePic:
 	and a
 	jr z, .player
 
-	ld de, sScratch + $1a tiles
+	ld de, sScratch + (3 * 7 + 5) tiles
 	call CopyMinimizePic
 	ld hl, vTiles2 tile $00
 	ld de, sScratch
@@ -987,7 +987,7 @@ GetMinimizePic:
 	jr .done
 
 .player
-	ld de, sScratch + $160
+	ld de, sScratch + (3 * 6 + 4) tiles
 	call CopyMinimizePic
 	ld hl, vTiles2 tile $31
 	ld de, sScratch

engine/battle_anims/core.asm

@@ -263,14 +263,12 @@ InitBattleAnimBuffer:
 	jr nz, .no_sub
 	ld a, [wFXAnimID]
 	cp KINESIS
-	jr z, .kinesis
+	jr z, .do_sub
 	cp SOFTBOILED
-	jr z, .softboiled
+	jr z, .do_sub
 	cp MILK_DRINK
 	jr nz, .no_sub
-.kinesis
-.softboiled
-.milk_drink
+.do_sub
 	pop af
 	sub 1 * 8
 	jr .done

engine/battle_anims/functions.asm

@@ -4293,14 +4293,14 @@ BattleAnim_Cosine_e:
 	ld e, a
 	ret
 
-BattleAnim_AbsSinePrecise:
+BattleAnim_AbsSinePrecise: ; unreferenced
 	ld a, e
 	call BattleAnim_Sine
 	ld e, l
 	ld d, h
 	ret
 
-BattleAnim_AbsCosinePrecise:
+BattleAnim_AbsCosinePrecise: ; unreferenced
 	ld a, e
 	call BattleAnim_Cosine
 	ld e, l

engine/debug/color_picker.asm

@@ -32,7 +32,7 @@
 	const DEBUGCOLORMAIN_INITTMHM       ; 4
 	const DEBUGCOLORMAIN_TMHMJOYPAD     ; 5
 
-DebugColorPicker:
+DebugColorPicker: ; unreferenced
 ; A debug menu to test monster and trainer palettes at runtime.
 	ldh a, [hCGB]
 	and a
@@ -1053,7 +1053,7 @@ INCBIN "gfx/debug/up_arrow.2bpp"
 DebugColor_GFX:
 INCBIN "gfx/debug/color_test.2bpp"
 
-TilesetColorPicker:
+TilesetColorPicker: ; unreferenced
 ; A debug menu to test tileset palettes at runtime.
 ; dummied out
 	ret

engine/debug/debug_room.asm

@@ -1147,9 +1147,9 @@ DebugRoom_BoxStructStrings:
 .Move4:     db "MOVE 4@"
 .ID0:       db "ID[0]@"
 .ID1:       db "ID[1]@"
-.BaseExp0:  db "BASE EXP[0]@"
-.BaseExp1:  db "BASE EXP[1]@"
-.BaseExp2:  db "BASE EXP[2]@"
+.BaseExp0:  db "BASE EXP[0]@" ; unreferenced
+.BaseExp1:  db "BASE EXP[1]@" ; unreferenced
+.BaseExp2:  db "BASE EXP[2]@" ; unreferenced
 .HPExp0:    db "HP EXP[0]@"
 .HPExp1:    db "HP EXP[1]@"
 .AttkExp0:  db "ATTK EXP[0]@"

engine/events/daycare.asm

@@ -160,7 +160,7 @@ DayCareAskDepositPokemon:
 	scf
 	ret
 
-.DaycareDummyText:
+.DaycareDummyText: ; unreferenced
 	text_far _DaycareDummyText
 	text_end
 

engine/events/engine_flags.asm

@@ -57,7 +57,7 @@ EngineFlagAction::
 	jr z, .set   ; b = 1
 
 ; Return the given flag in c.
-.check
+; check
 	ld a, [de]
 	and c
 	ld c, a

engine/events/heal_machine_anim.asm

@@ -56,7 +56,7 @@ HealMachineAnim:
 .Pointers:
 ; entries correspond to HEALMACHINE_* constants
 	dw .Pokecenter
-	dw .ElmLab
+	dw .ElmsLab
 	dw .HallOfFame
 
 healmachineanimseq: MACRO
@@ -68,7 +68,7 @@ ENDM
 
 .Pokecenter:
 	healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
-.ElmLab:
+.ElmsLab:
 	healmachineanimseq LOADGFX, PCLOADBALLS, PLAYMUSIC, FINISH
 .HallOfFame:
 	healmachineanimseq LOADGFX, HOFLOADBALLS, HOFPLAYSFX, FINISH

engine/events/magnet_train.asm

@@ -56,7 +56,7 @@ MagnetTrain:
 	ld [wRequested2bppSource + 1], a
 	ld [wRequested2bppDest], a
 	ld [wRequested2bppDest + 1], a
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 	call ClearTilemap
 
 	pop af

engine/events/overworld.asm

@@ -284,7 +284,6 @@ FlashFunction:
 	ld a, [wTimeOfDayPalset]
 	cp DARKNESS_PALSET
 	jr nz, .notadarkcave
-.useflash
 	call UseFlash
 	ld a, $81
 	ret
@@ -1391,7 +1390,7 @@ HasRockSmash:
 	ld d, ROCK_SMASH
 	call CheckPartyMove
 	jr nc, .yes
-.no
+; no
 	ld a, 1
 	jr .done
 .yes
@@ -1596,7 +1595,7 @@ RodNothingText:
 	text_far _RodNothingText
 	text_end
 
-UnusedNothingHereText: ; unused
+UnusedNothingHereText: ; unreferenced
 	text_far _UnusedNothingHereText
 	text_end
 

engine/events/poisonstep.asm

@@ -149,6 +149,6 @@ DoPoisonStep::
 	text_far _PoisonFaintText
 	text_end
 
-.PoisonWhiteoutText:
+.PoisonWhiteoutText: ; unreferenced
 	text_far _PoisonWhiteoutText
 	text_end

engine/events/print_unown_2.asm

@@ -30,7 +30,7 @@ RotateUnownFrontpic:
 	cp 7 * 7
 	jr c, .loop
 
-	ld hl, wGameboyPrinterRAM
+	ld hl, wGameboyPrinter2bppSource
 	ld de, sScratch
 	ld bc, 7 * 7 tiles
 	call CopyBytes
@@ -100,7 +100,7 @@ y = 0
 rept \1
 x = \1 * (\2 - 1) + y
 rept \2
-	dw wGameboyPrinterRAM tile x
+	dw wGameboyPrinter2bppSource tile x
 x = x - \2
 endr
 y = y + 1

engine/events/specials.asm

@@ -414,17 +414,17 @@ GameboyCheck:
 	ldh a, [hCGB]
 	and a
 	jr nz, .cgb
-
 	ldh a, [hSGB]
 	and a
 	jr nz, .sgb
-
-.gb
+; gb
 	xor a ; GBCHECK_GB
 	jr .done
+
 .sgb
 	ld a, GBCHECK_SGB
 	jr .done
+
 .cgb
 	ld a, GBCHECK_CGB
 .done

engine/events/treemons.asm

@@ -208,7 +208,7 @@ GetTreeScore:
 	cp 5
 	jr c, .good
 
-.bad
+; bad
 	xor a ; TREEMON_SCORE_BAD
 	ret
 

engine/games/card_flip.asm

@@ -1,7 +1,8 @@
 CARDFLIP_LIGHT_OFF EQU "♂" ; $ef
 CARDFLIP_LIGHT_ON  EQU "♀" ; $f5
 
-CARDFLIP_DECK_SIZE EQU 4 * 6
+CARDFLIP_DECK_SIZE EQUS "(wDeckEnd - wDeck)"
+	assert wDiscardPileEnd - wDiscardPile == wDeckEnd - wDeck
 
 DummyGameGFX:
 ; Graphics for an unused Game Corner
@@ -577,7 +578,7 @@ CardFlip_CopyOAM:
 	jr nz, .loop
 	ret
 
-CardFlip_ShiftDigitsUpOnePixel:
+CardFlip_ShiftDigitsUpOnePixel: ; unreferenced
 ; The top rows of digits 1-9 become the bottom rows of 0-8,
 ; so this routine relies on the top rows being blank.
 	ld de, vTiles0 tile "0"

engine/games/dummy_game.asm

@@ -20,7 +20,7 @@ _DummyGame:
 	ld a, BANK(DummyGameGFX)
 	call FarCopyBytes
 	ld a, $8
-	ld hl, wc508
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], $0
 	hlcoord 0, 0

engine/gfx/cgb_layouts.asm

@@ -308,7 +308,7 @@ Function95a0: ; unreferenced
 	call LoadHLPaletteIntoDE
 	jr .GotPalette
 
-.GetMonPalette:
+.GetMonPalette: ; unreferenced
 	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black

engine/gfx/color.asm

@@ -15,31 +15,31 @@ CheckShininess:
 ; Attack
 	ld a, [hl]
 	and 1 << SHINY_ATK_BIT
-	jr z, .NotShiny
+	jr z, .not_shiny
 
 ; Defense
 	ld a, [hli]
 	and $f
 	cp  SHINY_DEF_VAL
-	jr nz, .NotShiny
+	jr nz, .not_shiny
 
 ; Speed
 	ld a, [hl]
 	and $f0
 	cp  SHINY_SPD_VAL << 4
-	jr nz, .NotShiny
+	jr nz, .not_shiny
 
 ; Special
 	ld a, [hl]
 	and $f
 	cp  SHINY_SPC_VAL
-	jr nz, .NotShiny
+	jr nz, .not_shiny
 
-.Shiny:
+; shiny
 	scf
 	ret
 
-.NotShiny:
+.not_shiny
 	and a
 	ret
 
@@ -49,30 +49,30 @@ Unused_CheckShininess:
 ; Attack
 	ld a, [hl]
 	cp 10 << 4
-	jr c, .NotShiny
+	jr c, .not_shiny
 
 ; Defense
 	ld a, [hli]
 	and $f
 	cp 10
-	jr c, .NotShiny
+	jr c, .not_shiny
 
 ; Speed
 	ld a, [hl]
 	cp 10 << 4
-	jr c, .NotShiny
+	jr c, .not_shiny
 
 ; Special
 	ld a, [hl]
 	and $f
 	cp 10
-	jr c, .NotShiny
+	jr c, .not_shiny
 
-.Shiny:
+; shiny
 	scf
 	ret
 
-.NotShiny:
+.not_shiny
 	and a
 	ret
 
@@ -894,7 +894,7 @@ PushSGBBorder:
 
 .LoadSGBBorderPointers:
 	ld hl, SGBBorderGFX
-	ld de, SGBBorderMap
+	ld de, SGBBorderMapAndPalettes
 	ret
 
 SGB_ClearVRAM:
@@ -1091,24 +1091,24 @@ INCLUDE "data/sgb_ctrl_packets.asm"
 PredefPals:
 INCLUDE "gfx/sgb/predef.pal"
 
+SGBBorderMapAndPalettes:
+; interleaved tile ids and palette ids, without the center 20x18 screen area
 IF DEF(_GOLD)
-SGBBorderMap:
-; interleaved tile ids and palette ids, without the center 20x18 screen area
 INCBIN "gfx/sgb/gold_border.sgb.tilemap"
-SGBBorderPalettes:
-; assumed to come after SGBBorderMap
-INCLUDE "gfx/sgb/gold_border.pal"
-SGBBorderGFX:
-INCBIN "gfx/sgb/gold_border.2bpp"
-
 ELIF DEF(_SILVER)
-SGBBorderMap:
-; interleaved tile ids and palette ids, without the center 20x18 screen area
 INCBIN "gfx/sgb/silver_border.sgb.tilemap"
-SGBBorderPalettes:
-; assumed to come after SGBBorderMap
+ENDC
+; four SGB palettes of 16 colors each; only the first 4 colors are used
+IF DEF(_GOLD)
+INCLUDE "gfx/sgb/gold_border.pal"
+ELIF DEF(_SILVER)
 INCLUDE "gfx/sgb/silver_border.pal"
+ENDC
+
 SGBBorderGFX:
+IF DEF(_GOLD)
+INCBIN "gfx/sgb/gold_border.2bpp"
+ELIF DEF(_SILVER)
 INCBIN "gfx/sgb/silver_border.2bpp"
 ENDC
 
@@ -1225,7 +1225,7 @@ INCLUDE "gfx/diploma/diploma.pal"
 PartyMenuOBPals:
 INCLUDE "gfx/stats/party_menu_ob.pal"
 
-UnusedBattleObjectPals:
+UnusedBattleObjectPals: ; unreferenced
 INCLUDE "gfx/battle_anims/unused_battle_anims.pal"
 
 GSTitleBGPals:

engine/gfx/load_font.asm

@@ -94,7 +94,7 @@ LoadStatsScreenPageTilesGFX:
 	call Get2bpp
 	ret
 
-LoadFontsBattleLevel:
+LoadFontsBattleLevel: ; unreferenced
 	ld de, FontBattleExtra + 14 tiles
 	ld hl, vTiles2 tile "<LV>" ; $6e
 	lb bc, BANK(FontBattleExtra), 1

engine/gfx/load_pics.asm

@@ -69,7 +69,6 @@ GetFrontpic:
 	cp EGG + 1
 	ret nc
 
-.is_a_pokemon
 	push de
 	call GetBaseData
 	ld a, [wBasePicSize]
@@ -133,7 +132,6 @@ GetMonBackpic:
 	cp EGG + 1
 	ret nc
 
-.is_a_pokemon
 	push de
 	ld a, BANK(sDecompressBuffer)
 	call OpenSRAM

engine/items/item_effects.asm

@@ -1029,14 +1029,13 @@ LevelBallMultiplier:
 	ld b, $ff
 	ret
 
-; These two texts were carried over from gen 1.
-; They are not used in gen 2, and are dummied out.
+; BallDodgedText and BallMissedText were used in Gen 1.
 
-BallDodgedText:
+BallDodgedText: ; unreferenced
 	text_far _BallDodgedText
 	text_end
 
-BallMissedText:
+BallMissedText: ; unreferenced
 	text_far _BallMissedText
 	text_end
 
@@ -1864,14 +1863,14 @@ LoadCurHPIntoBuffer5:
 	ld [wBuffer5], a
 	ret
 
-LoadHPIntoBuffer5:
+LoadHPIntoBuffer5: ; unreferenced
 	ld a, d
 	ld [wBuffer6], a
 	ld a, e
 	ld [wBuffer5], a
 	ret
 
-LoadHPFromBuffer5:
+LoadHPFromBuffer5: ; unreferenced
 	ld a, [wBuffer6]
 	ld d, a
 	ld a, [wBuffer5]
@@ -2315,7 +2314,6 @@ RestorePPEffect:
 	jr c, .do_ppup
 
 .CantUsePPUpOnSketch:
-.pp_is_maxed_out
 	ld hl, PPIsMaxedOutText
 	call PrintText
 	jr .loop2
@@ -2612,16 +2610,17 @@ WontHaveAnyEffectMessage:
 	ld hl, ItemWontHaveEffectText
 	jr CantUseItemMessage
 
-BelongsToSomeoneElseMessage:
+BelongsToSomeoneElseMessage: ; unreferenced
 	ld hl, ItemBelongsToSomeoneElseText
 	jr CantUseItemMessage
 
-CyclingIsntAllowedMessage:
+CyclingIsntAllowedMessage: ; unreferenced
 	ld hl, NoCyclingText
 	jr CantUseItemMessage
 
-CantGetOnYourBikeMessage:
+CantGetOnYourBikeMessage: ; unreferenced
 	ld hl, ItemCantGetOnText
+	; fallthrough
 
 CantUseItemMessage:
 ; Item couldn't be used.
@@ -2673,11 +2672,11 @@ ItemUsedText:
 	text_far _ItemUsedText
 	text_end
 
-ItemGotOnText:
+ItemGotOnText: ; unreferenced
 	text_far _ItemGotOnText
 	text_end
 
-ItemGotOffText:
+ItemGotOffText: ; unreferenced
 	text_far _ItemGotOffText
 	text_end
 

engine/items/items.asm

@@ -481,7 +481,7 @@ GetNumberedTMHM:
 	jr c, .done
 	cp ITEM_DC - (TM01 - 1) - 1
 	jr c, .skip_one
-.skip_two
+; skip two
 	inc a
 .skip_one
 	inc a

engine/items/pack.asm

@@ -1520,7 +1520,7 @@ PC_Mart_BallsPocketMenuHeader:
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription
 
-PackNoItemText:
+PackNoItemText: ; unreferenced
 	text_far _PackNoItemText
 	text_end
 
@@ -1560,7 +1560,7 @@ PackEmptyText:
 	text_far _PackEmptyText
 	text_end
 
-YouCantUseItInABattleText:
+YouCantUseItInABattleText: ; unreferenced
 	text_far _YouCantUseItInABattleText
 	text_end
 

engine/items/tmhm.asm

@@ -76,7 +76,6 @@ ChooseMonToLearnTMHM:
 	ld bc, 12
 	call CopyBytes
 	call ClearBGPalettes
-ChooseMonToLearnTMHM_NoRefresh:
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuGFX
@@ -158,7 +157,7 @@ TeachTMHM:
 	and a
 	ret
 
-.unused
+.didnt_use ; unreferenced
 	ld a, 2
 	ld [wItemEffectSucceeded], a
 .learned_move

engine/link/link.asm

@@ -105,8 +105,8 @@ Gen2ToGen1LinkComms:
 	ld de, wLinkData
 	ld bc, $1a2
 	call Link_CopyOTData
-	ld de, wPlayerTrademonSpecies
-	ld hl, wTimeCapsulePartyMon1Species
+	ld de, wPlayerTrademon
+	ld hl, wTimeCapsulePlayerData
 	ld c, 2
 .loop
 	ld a, [de]
@@ -160,7 +160,7 @@ Gen2ToGen1LinkComms:
 
 .done_party
 	ld [de], a
-	ld hl, wTimeCapsulePartyMon1Species
+	ld hl, wTimeCapsulePlayerData
 	call Link_ConvertPartyStruct1to2
 	ld a, LOW(wOTPartyMonOT)
 	ld [wUnusedCFFE], a
@@ -251,8 +251,8 @@ Gen2ToGen2LinkComms:
 	ld de, wLinkData
 	ld bc, $1b9
 	call Link_CopyOTData
-	ld de, wPlayerTrademonSpecies
-	ld hl, wLinkPlayerPartyMon1Species
+	ld de, wPlayerTrademon
+	ld hl, wLinkPlayerData
 	ld c, 2
 .loop1
 	ld a, [de]
@@ -525,7 +525,7 @@ FixDataForLinkTransfer:
 	ld [hli], a
 	dec b
 	jr nz, .loop3
-	ld hl, wTimeCapsulePartyMon1 - 1 + PARTY_LENGTH
+	ld hl, wTimeCapsulePlayerData - 1 + PARTY_LENGTH
 	ld de, wc512
 	lb bc, 0, 0
 .loop4

engine/link/mystery_gift.asm

@@ -1020,7 +1020,7 @@ MysteryGift_CopyReceivedDecosToPC:
 .skip
 	inc c
 	ld a, c
-	cp TrophyIDs - DecorationIDs
+	cp NUM_NON_TROPHY_DECOS
 	jr c, .loop
 	jp CloseSRAM
 

engine/link/mystery_gift_2.asm

@@ -2,23 +2,23 @@ PrepMysteryGiftDataToSend:
 	ld de, wMysteryGiftStaging
 	ld a, $1 + GS_VERSION
 	ld [de], a
-	inc de ; wc701
+	inc de ; wMysteryGiftStaging+1
 	ld a, BANK(sGameData)
 	call OpenSRAM
 	ld hl, sPlayerData + wPlayerID - wPlayerData
 	ld a, [hli]
 	ld [de], a
 	ld b, a
-	inc de ; wc702
+	inc de ; wMysteryGiftStaging+2
 	ld a, [hl]
 	ld [de], a
 	ld c, a
-	inc de ; wc703
+	inc de ; wMysteryGiftStaging+3
 	push bc
 	ld hl, sPlayerData + wPlayerName - wPlayerData
 	ld bc, NAME_LENGTH
 	call CopyBytes
-	push de ; wc70e
+	push de ; wMysteryGiftStaging+14
 	ld hl, sPokemonData + wPokedexCaught - wPokemonData
 	ld b, wEndPokedexCaught - wPokedexCaught
 	call CountSetBits
@@ -26,21 +26,21 @@ PrepMysteryGiftDataToSend:
 	pop bc
 	ld a, [wNumSetBits]
 	ld [de], a
-	inc de ; wc70f
+	inc de ; wMysteryGiftStaging+15
 	call CloseSRAM
 	call Random
 	and 1
 	ld [de], a
-	inc de ; wc710
+	inc de ; wMysteryGiftStaging+16
 	call .RandomSample
 	ld [de], a
-	inc de ; wc711
+	inc de ; wMysteryGiftStaging+17
 	ld a, c
 	ld c, b
 	ld b, a
 	call .RandomSample
 	ld [de], a
-	inc de ; wc712
+	inc de ; wMysteryGiftStaging+18
 	ld a, BANK(sBackupMysteryGiftItem)
 	call OpenSRAM
 	ld a, [sBackupMysteryGiftItem]

engine/menus/main_menu.asm

@@ -218,20 +218,19 @@ MainMenu_PrintCurrentTimeAndDay:
 	call PrintNum
 	ret
 
-.min
-; unused
+.minString: ; unreferenced
 	db "min.@"
 
 .PrintTimeNotSet:
 	hlcoord 1, 14
-	ld de, .TimeNotSet
+	ld de, .TimeNotSetString
 	call PlaceString
 	ret
 
-.TimeNotSet:
+.TimeNotSetString:
 	db "TIME NOT SET@"
 
-.MainMenuTimeUnknownText:
+.MainMenuTimeUnknownText: ; unreferenced
 	text_far _MainMenuTimeUnknownText
 	text_end
 

engine/menus/menu_2.asm

@@ -157,18 +157,18 @@ StartMenu_PrintBugContestStatus:
 	set NO_TEXT_SCROLL, [hl]
 	call StartMenu_DrawBugContestStatusBox
 	hlcoord 1, 5
-	ld de, .Balls_EN
+	ld de, .BallsString
 	call PlaceString
 	hlcoord 8, 5
 	ld de, wParkBallsRemaining
 	lb bc, PRINTNUM_LEFTALIGN | 1, 2
 	call PrintNum
 	hlcoord 1, 1
-	ld de, .CAUGHT
+	ld de, .CaughtString
 	call PlaceString
 	ld a, [wContestMon]
 	and a
-	ld de, .None
+	ld de, .NoneString
 	jr z, .no_contest_mon
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
@@ -180,7 +180,7 @@ StartMenu_PrintBugContestStatus:
 	and a
 	jr z, .skip_level
 	hlcoord 1, 3
-	ld de, .LEVEL
+	ld de, .LevelString
 	call PlaceString
 	ld a, [wContestMonLevel]
 	ld h, b
@@ -194,15 +194,15 @@ StartMenu_PrintBugContestStatus:
 	ld [wOptions], a
 	ret
 
-.Balls_JP:
+.BallsJPString: ; unreferenced
 	db "ボール　　　こ@"
-.CAUGHT:
+.CaughtString:
 	db "CAUGHT@"
-.Balls_EN:
+.BallsString:
 	db "BALLS:@"
-.None:
+.NoneString:
 	db "None@"
-.LEVEL:
+.LevelString:
 	db "LEVEL@"
 
 Kurt_SelectApricorn:

engine/menus/naming_screen.asm

@@ -253,6 +253,7 @@ NamingScreen_InitText:
 NamingScreen_ApplyTextInputMode:
 	call NamingScreen_IsTargetBox
 	jr nz, .not_box
+	assert BoxNameInputLower - NameInputLower == BoxNameInputUpper - NameInputUpper
 	ld hl, BoxNameInputLower - NameInputLower
 	add hl, de
 	ld d, h
@@ -865,7 +866,7 @@ INCBIN "gfx/naming_screen/cursor.2bpp"
 
 INCLUDE "data/text/name_input_chars.asm"
 
-NamingScreenGFX_End: ; unused
+NamingScreenGFX_End: ; unreferenced
 INCBIN "gfx/naming_screen/end.1bpp"
 
 NamingScreenGFX_MiddleLine:

engine/menus/trainer_card.asm

@@ -44,10 +44,10 @@ TrainerCard:
 	call ClearTilemap
 	call DisableLCD
 
-	ld hl, ChrisCardPic
+	ld hl, ChrisPicAndTrainerCardGFX
 	ld de, vTiles2
-	ld bc, 41 tiles
-	ld a, BANK(ChrisCardPic)
+	ld bc, (35 + 6) tiles
+	ld a, BANK(ChrisPicAndTrainerCardGFX)
 	call FarCopyBytes
 
 	ld hl, CardStatusGFX
@@ -619,8 +619,10 @@ TrainerCard_JohtoBadgesOAM:
 	db $1c,            $20, $24, $20 | (1 << 7)
 	db $1c | (1 << 7), $20, $24, $20 | (1 << 7)
 
-ChrisCardPic:  INCBIN "gfx/trainer_card/chris_card.2bpp"
-CardGFX:       INCBIN "gfx/trainer_card/trainer_card.2bpp"
+ChrisPicAndTrainerCardGFX:
+INCBIN "gfx/trainer_card/chris_card.2bpp"
+INCBIN "gfx/trainer_card/trainer_card.2bpp"
+
 CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
 
 LeaderGFX:  INCBIN "gfx/trainer_card/leaders.2bpp"

engine/movie/credits.asm

@@ -193,7 +193,7 @@ Credits_RequestGFX:
 	xor a
 	ldh [hBGMapMode], a
 	ld a, 8
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 	jp Credits_Next
 
 Credits_LYOverride:

engine/movie/evolution_animation.asm

@@ -65,7 +65,6 @@ EvolutionAnimation:
 	ld c, TRUE
 	call .GetSGBLayout
 
-.AnimationSequence:
 	call ClearJoypad
 	lb bc, 1, 16 ; flash b times, wait c frames in between
 .loop

engine/overworld/cmd_queue.asm

@@ -148,7 +148,7 @@ CmdQueues_IncAnonJumptableIndex:
 	inc [hl]
 	ret
 
-CmdQueues_DecAnonJumptableIndex:
+CmdQueues_DecAnonJumptableIndex: ; unreferenced
 	ld hl, CMDQUEUE_05
 	add hl, bc
 	dec [hl]
@@ -163,7 +163,7 @@ CmdQueue_Type1:
 
 CmdQueue_Type4:
 	call CmdQueues_AnonJumptable
-	; anonymous dw
+.anon_dw
 	dw .zero
 	dw .one
 

engine/overworld/decorations.asm

@@ -932,7 +932,7 @@ GetDecorationID:
 	pop hl
 	ret
 
-SetAllDecorationFlags:
+SetAllDecorationFlags: ; unreferenced
 	ld hl, DecorationIDs
 .loop
 	ld a, [hli]

engine/overworld/events.asm

@@ -25,76 +25,76 @@ OverworldLoop::
 
 DisableEvents:
 	xor a
-	ld [wScriptFlags3], a
+	ld [wScriptFlags2], a
 	ret
 
 EnableEvents::
 	ld a, $ff
-	ld [wScriptFlags3], a
+	ld [wScriptFlags2], a
 	ret
 
-CheckBit5_ScriptFlags3:
-	ld hl, wScriptFlags3
+CheckBit5_ScriptFlags2:
+	ld hl, wScriptFlags2
 	bit 5, [hl]
 	ret
 
-DisableWarpsConnxns:
-	ld hl, wScriptFlags3
+DisableWarpsConnxns: ; unreferenced
+	ld hl, wScriptFlags2
 	res 2, [hl]
 	ret
 
-DisableCoordEvents:
-	ld hl, wScriptFlags3
+DisableCoordEvents: ; unreferenced
+	ld hl, wScriptFlags2
 	res 1, [hl]
 	ret
 
-DisableStepCount:
-	ld hl, wScriptFlags3
+DisableStepCount: ; unreferenced
+	ld hl, wScriptFlags2
 	res 0, [hl]
 	ret
 
-DisableWildEncounters:
-	ld hl, wScriptFlags3
+DisableWildEncounters: ; unreferenced
+	ld hl, wScriptFlags2
 	res 4, [hl]
 	ret
 
-EnableWarpsConnxns:
-	ld hl, wScriptFlags3
+EnableWarpsConnxns: ; unreferenced
+	ld hl, wScriptFlags2
 	set 2, [hl]
 	ret
 
-EnableCoordEvents:
-	ld hl, wScriptFlags3
+EnableCoordEvents: ; unreferenced
+	ld hl, wScriptFlags2
 	set 1, [hl]
 	ret
 
-EnableStepCount:
-	ld hl, wScriptFlags3
+EnableStepCount: ; unreferenced
+	ld hl, wScriptFlags2
 	set 0, [hl]
 	ret
 
 EnableWildEncounters:
-	ld hl, wScriptFlags3
+	ld hl, wScriptFlags2
 	set 4, [hl]
 	ret
 
 CheckWarpConnxnScriptFlag:
-	ld hl, wScriptFlags3
+	ld hl, wScriptFlags2
 	bit 2, [hl]
 	ret
 
 CheckCoordEventScriptFlag:
-	ld hl, wScriptFlags3
+	ld hl, wScriptFlags2
 	bit 1, [hl]
 	ret
 
 CheckStepCountScriptFlag:
-	ld hl, wScriptFlags3
+	ld hl, wScriptFlags2
 	bit 0, [hl]
 	ret
 
 CheckWildEncountersScriptFlag:
-	ld hl, wScriptFlags3
+	ld hl, wScriptFlags2
 	bit 4, [hl]
 	ret
 
@@ -133,7 +133,7 @@ EnterMap:
 	ld [wMapStatus], a
 	ret
 
-UnusedWait30Frames:
+UnusedWait30Frames: ; unreferenced
 	ld c, 30
 	call DelayFrames
 	ret
@@ -245,7 +245,7 @@ PlayerEvents:
 	and a
 	ret nz
 
-	call Dummy_CheckScriptFlags3Bit5 ; This is a waste of time
+	call Dummy_CheckScriptFlags2Bit5 ; This is a waste of time
 
 	call CheckTrainerBattle_GetPlayerEvent
 	jr c, .ok
@@ -382,8 +382,8 @@ SetMinTwoStepWildEncounterCooldown:
 	ld [wWildEncounterCooldown], a
 	ret
 
-Dummy_CheckScriptFlags3Bit5:
-	call CheckBit5_ScriptFlags3
+Dummy_CheckScriptFlags2Bit5:
+	call CheckBit5_ScriptFlags2
 	ret z
 	call SetXYCompareFlags
 	ret
@@ -468,8 +468,8 @@ CheckTimeEvents:
 	scf
 	ret
 
-.unused
-	ld a, 8
+.unused ; unreferenced
+	ld a, $8 ; ???
 	scf
 	ret
 

engine/overworld/load_map_part.asm

@@ -136,7 +136,6 @@ ForceApplyFlashlight4: ; unreferenced
 	decoord 8, 8
 	ld bc, (SURROUNDING_WIDTH + 1) * 8
 	add hl, bc
-.loop
 	ld a, [hli]
 	ld [de], a
 	inc de

engine/overworld/map_objects.asm

@@ -2823,18 +2823,17 @@ InitSprites:
 
 .InitSprite:
 	xor a
-.skip1
 	ld hl, OBJECT_FLAGS2
 	add hl, bc
 	ld e, [hl]
 	bit OBJ_FLAGS2_7, e
-	jr z, .skip2
+	jr z, .not_priority
 	or PRIORITY
-.skip2
+.not_priority
 	bit USE_OBP1_F, e
-	jr z, .skip3
+	jr z, .not_obp_num
 	or OBP_NUM
-.skip3
+.not_obp_num
 	ld hl, OBJECT_PALETTE
 	add hl, bc
 	ld d, a
@@ -2844,9 +2843,9 @@ InitSprites:
 	ld d, a
 	xor a
 	bit OVERHEAD_F, e
-	jr z, .skip4
+	jr z, .not_overhead
 	or PRIORITY
-.skip4
+.not_overhead
 	ldh [hCurSpriteOAMFlags], a
 	ld hl, OBJECT_SPRITE_TILE
 	add hl, bc

engine/overworld/scripting.asm

@@ -1518,8 +1518,6 @@ Script_getcurlandmarkname:
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-
-ConvertLandmarkToText:
 	ld e, a
 	farcall GetLandmarkName
 	ld de, wStringBuffer1
@@ -2059,8 +2057,7 @@ Script_warpcheck:
 	farcall EnableEvents
 	ret
 
-Script_enableevents:
-; unused
+Script_enableevents: ; unreferenced
 	farcall EnableEvents
 	ret
 

engine/overworld/time.asm

@@ -158,7 +158,7 @@ CheckPokerusTick::
 	xor a
 	ret
 
-SetUnusedTwoDayTimer:
+SetUnusedTwoDayTimer: ; unreferenced
 	ld a, 2
 	ld hl, wUnusedTwoDayTimer
 	ld [hl], a
@@ -263,7 +263,7 @@ UpdateTimeRemaining:
 	scf
 	ret
 
-GetSecondsSinceIfLessThan60:
+GetSecondsSinceIfLessThan60: ; unreferenced
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@@ -285,7 +285,7 @@ GetMinutesSinceIfLessThan60:
 	ld a, [wMinutesSince]
 	ret
 
-GetHoursSinceIfLessThan24:
+GetHoursSinceIfLessThan24: ; unreferenced
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@@ -304,7 +304,7 @@ CalcDaysSince:
 	xor a
 	jr _CalcDaysSince
 
-CalcHoursDaysSince:
+CalcHoursDaysSince: ; unreferenced
 	inc hl
 	xor a
 	jr _CalcHoursDaysSince
@@ -378,7 +378,7 @@ CopyDayToHL:
 	ld [hl], a
 	ret
 
-CopyDayHourToHL:
+CopyDayHourToHL: ; unreferenced
 	ld a, [wCurDay]
 	ld [hli], a
 	ldh a, [hHours]

engine/phone/phone.asm

@@ -444,7 +444,7 @@ Script_SpecialBillCall::
 	ld e, PHONE_BILL
 	jp LoadCallerScript
 
-LoadElmCallScript:
+Script_SpecialElmCall: ; unreferenced
 	callasm .LoadElmScript
 	pause 30
 	sjump Script_ReceivePhoneCall
@@ -723,7 +723,7 @@ PhoneJustTalkToThemText:
 	text_far _PhoneJustTalkToThemText
 	text_end
 
-PhoneThankYouTextScript:
+PhoneThankYouTextScript: ; unreferenced
 	writetext PhoneThankYouText
 	end
 

engine/phone/scripts/elm.asm

@@ -95,7 +95,7 @@ ElmPhoneCallerScript:
 	specialphonecall SPECIALCALL_NONE
 	end
 
-.unused
+.neat ; unreferenced
 	writetext ElmPhoneGotAholdOfSomethingNeatText
 	specialphonecall SPECIALCALL_NONE
 	end

engine/phone/scripts/generic.asm

@@ -74,8 +74,8 @@ PhoneScript_GreetPhone_Female:
 	promptbutton
 	end
 
-; Huey
 Phone_GenericCall_Male_SkipMon:
+; only used by HueyPhoneCalleeScript and HueyPhoneCallerScript
 	special RandomPhoneMon
 	scall PhoneScript_Random2
 	ifequal 0, Phone_LookingAwesome_Male_SkipMon
@@ -83,8 +83,7 @@ Phone_GenericCall_Male_SkipMon:
 	promptbutton
 	sjump PhoneScript_SeeYouLater
 
-; unused
-Phone_GenericCall_Female_SkipMon:
+Phone_GenericCall_Female_SkipMon: ; unreferenced
 	special RandomPhoneMon
 	scall PhoneScript_Random2
 	ifequal 0, Phone_DressedUp_Female_SkipMon
@@ -92,13 +91,11 @@ Phone_GenericCall_Female_SkipMon:
 	promptbutton
 	sjump PhoneScript_ByeBye
 
-; Huey
 Phone_LookingAwesome_Male_SkipMon:
 	writetext PhoneMaleLookingAwesomeText
 	promptbutton
 	sjump PhoneScript_ByeBye
 
-; unused
 Phone_DressedUp_Female_SkipMon:
 	writetext PhoneFemaleDressedUpText
 	promptbutton

engine/pokedex/pokedex.asm

@@ -1166,7 +1166,7 @@ Pokedex_DrawDexEntryScreenBG:
 	call Pokedex_PlaceFrontpicTopLeftCorner
 	ret
 
-.Unused:
+.Number: ; unreferenced
 	db $5c, $5d, -1 ; No.
 .Height:
 	db "HT  ?", $5e, "??", $5f, -1 ; HT  ?'??"
@@ -2487,14 +2487,14 @@ Pokedex_LoadUnownFont:
 	ld a, BANK(sScratch)
 	call OpenSRAM
 	ld hl, UnownFont
-	ld de, sScratch + $188
+	ld de, sDecompressBuffer
 	ld bc, 39 tiles
 	ld a, BANK(UnownFont)
 	call FarCopyBytes
-	ld hl, sScratch + $188
+	ld hl, sDecompressBuffer
 	ld bc, (NUM_UNOWN + 1) tiles
 	call Pokedex_InvertTiles
-	ld de, sScratch + $188
+	ld de, sDecompressBuffer
 	ld hl, vTiles2 tile FIRST_UNOWN_CHAR
 	lb bc, BANK(Pokedex_LoadUnownFont), NUM_UNOWN + 1
 	call Request2bpp

engine/pokegear/pokegear.asm

@@ -1520,7 +1520,7 @@ RadioChannels:
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
-.kanto
+; kanto
 	and a
 	ret
 
@@ -2216,7 +2216,7 @@ FlyMap:
 ; The first 46 locations are part of Johto. The rest are in Kanto.
 	cp KANTO_LANDMARK
 	jr nc, .KantoFlyMap
-.JohtoFlyMap:
+; Johto fly map
 ; Note that .NoKanto should be modified in tandem with this branch
 	push af
 	ld a, JOHTO_FLYPOINT ; first Johto flypoint
@@ -2512,7 +2512,7 @@ Pokedex_GetArea:
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
-.kanto
+; kanto
 	ld a, [wTownMapCursorLandmark]
 	and a
 	jr z, .clear

engine/pokegear/radio.asm

@@ -119,7 +119,7 @@ PrintRadioLine:
 	ld [wRadioTextDelay], a
 	ret
 
-ReplacePeriodsWithSpaces:
+ReplacePeriodsWithSpaces: ; unreferenced
 	push hl
 	ld b, SCREEN_WIDTH * 2
 .loop
@@ -127,7 +127,6 @@ ReplacePeriodsWithSpaces:
 	cp "."
 	jr nz, .next
 	ld [hl], " "
-
 .next
 	inc hl
 	dec b
@@ -1378,7 +1377,7 @@ CopyRadioTextToRAM:
 	cp TX_FAR
 	jp z, FarCopyRadioText
 	ld de, wRadioText
-	ld bc, SCREEN_WIDTH * 2
+	ld bc, 2 * SCREEN_WIDTH
 	jp CopyBytes
 
 StartRadioStation:

engine/pokemon/bills_pc.asm

@@ -101,7 +101,7 @@ _DepositPKMN:
 	ld [wJumptableIndex], a
 	ret
 
-.go_back
+.go_back ; unreferenced
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
@@ -343,7 +343,7 @@ _WithdrawPKMN:
 	ld [wJumptableIndex], a
 	ret
 
-.unused
+.go_back ; unreferenced
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
@@ -594,7 +594,7 @@ _MovePKMNWithoutMail:
 	ld [wJumptableIndex], a
 	ret
 
-.unused
+.go_back ; unreferenced
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
@@ -2200,7 +2200,7 @@ PCString_ReleasedPKMN: db "Released <PK><MN>.@"
 PCString_Bye: db "Bye,@"
 PCString_Stored: db "Stored @"
 PCString_Got: db "Got @"
-PCString_Non: db "Non.@"
+PCString_Non: db "Non.@" ; unreferenced
 PCString_BoxFull: db "The BOX is full.@"
 PCString_PartyFull: db "The party's full!@"
 PCString_NoReleasingEGGS: db "No releasing EGGS!@"
@@ -2246,16 +2246,16 @@ _ChangeBox_MenuHeader:
 	dw .MenuData
 	db 1 ; default option
 
-.MenuData
+.MenuData:
 	db SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
 	db 4, 0 ; rows, columns
 	db SCROLLINGMENU_ITEMS_NORMAL ; item format
-	dba .boxes
-	dba .boxnames
+	dba .Boxes
+	dba .PrintBoxNames
 	dba NULL
 	dba BillsPC_PrintBoxCountAndCapacity
 
-.boxes
+.Boxes:
 	db NUM_BOXES
 x = 1
 rept NUM_BOXES
@@ -2264,7 +2264,7 @@ x = x + 1
 endr
 	db -1
 
-.boxnames
+.PrintBoxNames:
 	push de
 	ld a, [wMenuSelection]
 	dec a

engine/pokemon/breedmon_level_growth.asm

@@ -1,5 +1,5 @@
 GetBreedMon1LevelGrowth:
-	ld hl, wBreedMon1Stats
+	ld hl, wBreedMon1
 	ld de, wTempMon
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes
@@ -13,7 +13,7 @@ GetBreedMon1LevelGrowth:
 	ret
 
 GetBreedMon2LevelGrowth:
-	ld hl, wBreedMon2Stats
+	ld hl, wBreedMon2
 	ld de, wTempMon
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes

engine/pokemon/mail.asm

@@ -8,7 +8,7 @@ SendMailToPC:
 	cp MAILBOX_CAPACITY
 	jr nc, .full
 	ld bc, MAIL_STRUCT_LENGTH
-	ld hl, sMailbox
+	ld hl, sMailboxes
 	call AddNTimes
 	ld d, h
 	ld e, l
@@ -44,7 +44,7 @@ DeleteMailFromPC:
 	call OpenSRAM
 	ld a, b
 	push bc
-	ld hl, sMailbox
+	ld hl, sMailboxes
 	ld bc, MAIL_STRUCT_LENGTH
 	call AddNTimes
 	push hl
@@ -73,7 +73,7 @@ DeleteMailFromPC:
 
 ReadMailMessage:
 	ld a, b
-	ld hl, sMailbox
+	ld hl, sMailboxes
 	ld bc, MAIL_STRUCT_LENGTH
 	call AddNTimes
 	ld d, h
@@ -87,7 +87,7 @@ MoveMailFromPCToParty:
 	push bc
 	ld a, b
 	ld bc, MAIL_STRUCT_LENGTH
-	ld hl, sMailbox
+	ld hl, sMailboxes
 	call AddNTimes
 	push hl
 	ld a, [wCurPartyMon]
@@ -314,19 +314,19 @@ _PlayerMailBoxMenu:
 	text_end
 
 InitMail:
-; initialize wMailboxCount and beyond with incrementing values, one per mail
-; set z if no mail
+; return z if no mail
 	ld a, BANK(sMailboxCount)
 	call OpenSRAM
 	ld a, [sMailboxCount]
 	call CloseSRAM
-	ld hl, wMailboxCount
-	ld [hli], a
-	and a
 
+; initialize wMailboxCount from sMailboxCount
+	ld hl, wMailboxCount
+	ld [hli], a ; now hl = wMailboxItems
+	and a
 	jr z, .done ; if no mail, we're done
 
-	; load values in memory with incrementing values starting at wMailboxCount
+; initialize wMailboxItems with incrementing values starting at 1
 	ld b, a
 	ld a, 1
 .loop
@@ -334,6 +334,7 @@ InitMail:
 	inc a
 	dec b
 	jr nz, .loop
+
 .done
 	ld [hl], -1 ; terminate
 

engine/pokemon/mail_2.asm

@@ -385,7 +385,7 @@ LoadBlueSkyMailGFX:
 	ld de, BlueSkyMailGrassGFX
 	ld c, 1 * LEN_1BPP_TILE
 	call LoadMailGFX_Color3
-	ld de, MailDragoniteGFX
+	ld de, MailDragoniteAndSentretGFX
 	ld c, 23 * LEN_1BPP_TILE
 	call LoadMailGFX_Color3
 	ld de, MailCloudGFX
@@ -748,7 +748,7 @@ Mail_Place14TileAlternatingRow:
 	ld b, 14 / 2
 	jr Mail_PlaceAlternatingRow
 
-Mail_Place16TileAlternatingRow:
+Mail_Place16TileAlternatingRow: ; unreferenced
 	push af
 	ld b, 16 / 2
 	jr Mail_PlaceAlternatingRow
@@ -756,6 +756,7 @@ Mail_Place16TileAlternatingRow:
 Mail_Place18TileAlternatingRow:
 	push af
 	ld b, 18 / 2
+	; fallthrough
 
 Mail_PlaceAlternatingRow:
 .loop
@@ -793,16 +794,16 @@ Mail_PlaceAlternatingColumn:
 	pop af
 	ret
 
-Mail_Draw7TileRow:
-	ld b, $7
+Mail_Draw7TileRow: ; unreferenced
+	ld b, 7
 	jr Mail_DrawRowLoop
 
 Mail_Draw13TileRow:
-	ld b, $d
+	ld b, 13
 	jr Mail_DrawRowLoop
 
 Mail_Draw16TileRow:
-	ld b, $10
+	ld b, 16
 	jr Mail_DrawRowLoop
 
 Mail_DrawTopBottomBorder:
@@ -811,6 +812,7 @@ Mail_DrawTopBottomBorder:
 
 Mail_DrawFullWidthBorder:
 	ld b, SCREEN_WIDTH
+	; fallthrough
 
 Mail_DrawRowLoop:
 .loop

engine/pokemon/move_mon.asm

@@ -1723,7 +1723,6 @@ GivePoke::
 	ld d, h
 	ld e, l
 	pop hl
-.otnameloop
 	ld a, [wScriptBank]
 	call FarCopyBytes
 	ld a, [wCurPartyMon]

engine/pokemon/party_menu.asm

@@ -680,12 +680,10 @@ TeachWhichPKMNString:
 MoveToWhereString:
 	db "Move to where?@"
 
-ChooseAFemalePKMNString:
-; unused
+ChooseAFemalePKMNString: ; unreferenced
 	db "Choose a ♀<PK><MN>.@"
 
-ChooseAMalePKMNString:
-; unused
+ChooseAMalePKMNString: ; unreferenced
 	db "Choose a ♂<PK><MN>.@"
 
 ToWhichPKMNString:

engine/printer/printer_serial.asm

@@ -304,7 +304,7 @@ Printer_ResetData:
 	xor a
 	ld [wPrinterSendByteCounter], a
 	ld [wPrinterSendByteCounter + 1], a
-	ld hl, wGameboyPrinterRAM
+	ld hl, wGameboyPrinter2bppSource
 	ld bc, wGameboyPrinter2bppSourceEnd - wGameboyPrinter2bppSource
 	call Printer_ByteFill
 	ret
@@ -435,10 +435,10 @@ PrinterDataPacket3:
 PrinterDataPacket4:
 	db  4, 0, $00, 0
 	dw 4
-PrinterDataPacket5: ; unused
+PrinterDataPacket5: ; unreferenced
 	db  8, 0, $00, 0
 	dw 8
-PrinterDataPacket6: ; unused
+PrinterDataPacket6: ; unreferenced
 	db 15, 0, $00, 0
 	dw 15
 

engine/smallflag.asm

@@ -36,9 +36,9 @@ SmallFarFlagAction:
 	jr z, .set ; 1 = SET_FLAG
 	dec b
 	jr z, .check ; 2 = CHECK_FLAG
-; 0 = RESET_FLAG
+	; 0 = RESET_FLAG
 
-.reset
+; reset
 	ld a, c
 	cpl
 	and [hl]

engine/tilesets/tileset_anims.asm

@@ -279,7 +279,7 @@ ScrollTileRightLeft:
 	jr nz, ScrollTileLeft
 	jr ScrollTileRight
 
-ScrollTileUpDown:
+ScrollTileUpDown: ; unreferenced
 ; Scroll up for 4 ticks, then down for 4 ticks.
 	ld a, [wTileAnimationTimer]
 	inc a
@@ -665,7 +665,7 @@ AnimateWaterPalette:
 	cp %100 ; frame 4
 	jr z, .color2
 
-.color1
+; color1
 	ld hl, wBGPals1 palette PAL_BG_WATER color 1
 	ld a, [hli]
 	ldh [rBGPD], a

gfx/font.asm

@@ -33,13 +33,13 @@ INCBIN "gfx/battle/expbar.2bpp"
 TownMapGFX:
 INCBIN "gfx/pokegear/town_map.2bpp.lz"
 
-UnusedWeekdayKanjiGFX:
+UnusedWeekdayKanjiGFX: ; unreferenced
 INCBIN "gfx/font/unused_weekday_kanji.2bpp"
 
 PokegearPhoneIconGFX:
 INCBIN "gfx/font/phone_icon.2bpp"
 
-UnusedBoldFontGFX:
+UnusedBoldFontGFX: ; unreferenced
 INCBIN "gfx/font/unused_bold_font.1bpp"
 
 TextboxSpaceGFX:

gfx/mail.asm

@@ -55,15 +55,10 @@ INCBIN "gfx/mail/ditto.1bpp"
 MailMewGFX:
 INCBIN "gfx/mail/mew.1bpp"
 
-MailDragoniteGFX:
+MailDragoniteAndSentretGFX:
 INCBIN "gfx/mail/dragonite.1bpp"
-
-MailSentretGFX:
 INCBIN "gfx/mail/sentret.1bpp"
 
-MailUnusedGrassGFX:
-INCBIN "gfx/mail/unused_grass.1bpp"
-
 PortraitMailLargePokeballGFX:
 INCBIN "gfx/mail/large_pokeball.1bpp"
 

gfx/tileset_palette_maps.asm

@@ -85,7 +85,7 @@ INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"
 TilesetPlayersRoomPalMap:
 INCLUDE "gfx/tilesets/players_room_palette_map.asm"
 
-UnusedMuseumPalMap:
+UnusedMuseumPalMap: ; unreferenced
 INCLUDE "gfx/tilesets/unused_museum_palette_map.asm"
 
 TilesetIcePathPalMap:

home/audio.asm

@@ -409,7 +409,7 @@ SpecialMapMusic::
 	and a
 	ret
 
-.bike
+.bike ; unreferenced
 	ld de, MUSIC_BICYCLE
 	scf
 	ret

home/battle.asm

@@ -252,6 +252,6 @@ PushLYOverrides::
 	ld a, HIGH(wLYOverrides)
 	ld [wRequested2bppDest + 1], a
 
-	ld a, (wLYOverridesEnd - wLYOverrides) / 16
-	ld [wRequested2bpp], a
+	ld a, (wLYOverridesEnd - wLYOverrides) / LEN_2BPP_TILE
+	ld [wRequested2bppSize], a
 	ret

home/decompress.asm

@@ -80,7 +80,6 @@ LZ_LONG_HI   EQU %00000011
 	cp LZ_LONG
 	jr nz, .short
 
-.long
 ; The count is now 10 bits.
 
 	; Read the next 3 bits.
@@ -133,7 +132,7 @@ LZ_LONG_HI   EQU %00000011
 	cp LZ_ZERO
 	jr z, .Zero
 
-.Literal:
+; Literal
 ; Read literal data for bc bytes.
 .lloop
 	dec c
@@ -215,10 +214,8 @@ LZ_LONG_HI   EQU %00000011
 	bit 7, a ; sign
 	jr z, .positive
 
-.negative
-; hl = de - a
-	; Since we can't subtract a from de,
-	; Make it negative and add de.
+; negative
+	; hl = de + -a
 	and %01111111
 	cpl
 	add e

home/gfx.asm

@@ -137,7 +137,7 @@ Request2bpp::
 	cp TILES_PER_CYCLE
 	jr nc, .cycle
 
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 	call DelayFrame
 
 	pop af
@@ -149,7 +149,7 @@ Request2bpp::
 
 .cycle
 	ld a, TILES_PER_CYCLE
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 
 	call DelayFrame
 	ld a, c
@@ -182,7 +182,7 @@ Request1bpp::
 	cp TILES_PER_CYCLE
 	jr nc, .cycle
 
-	ld [wRequested1bpp], a
+	ld [wRequested1bppSize], a
 	call DelayFrame
 
 	pop af
@@ -194,7 +194,7 @@ Request1bpp::
 
 .cycle
 	ld a, TILES_PER_CYCLE
-	ld [wRequested1bpp], a
+	ld [wRequested1bppSize], a
 
 	call DelayFrame
 	ld a, c

home/print_bcd.asm

@@ -33,10 +33,11 @@ PrintBCDNumber::
 	jr nz, .loop
 	bit PRINTNUM_LEADINGZEROS_F, b
 	jr z, .done ; if so, we are done
-.numberEqualsZero ; if every digit of the BCD number is zero
+; every digit of the BCD number is zero
 	bit PRINTNUM_LEFTALIGN_F, b
 	jr nz, .skipLeftAlignmentAdjustment
-	dec hl ; if the string is left-aligned, it needs to be moved back one space
+; the string is left-aligned; it needs to be moved back one space
+	dec hl
 .skipLeftAlignmentAdjustment
 	bit PRINTNUM_MONEY_F, b
 	jr z, .skipCurrencySymbol
@@ -53,7 +54,7 @@ PrintBCDDigit::
 	and %00001111
 	and a
 	jr z, .zeroDigit
-.nonzeroDigit
+; nonzero digit
 	bit PRINTNUM_LEADINGZEROS_F, b ; have any non-space characters been printed?
 	jr z, .outputDigit
 ; if bit 7 is set, then no numbers have been printed yet

home/print_num.asm

@@ -35,7 +35,6 @@ PrintNum::
 	cp 2
 	jr z, .word
 ; maximum 3 bytes
-.long
 	ld a, [de]
 	ldh [hPrintNumBuffer + 1], a
 	inc de
@@ -81,7 +80,7 @@ PrintNum::
 	cp 6
 	jr z, .six
 
-.seven
+; seven
 	ld a, HIGH(1000000 >> 8)
 	ldh [hPrintNumBuffer + 4], a
 	ld a, HIGH(1000000) ; mid
@@ -301,7 +300,7 @@ PrintNum::
 	inc hl
 	ret
 
-PrintHexNumber:: ; unreferenced
+PrintHexNumber::
 ; Print the c-byte value from de to hl as hexadecimal digits.
 .loop
 	push bc

home/text.asm

@@ -238,18 +238,19 @@ ENDM
 .not_diacritic
 	cp FIRST_REGULAR_TEXT_CHAR
 	jr nc, .place
-
+; dakuten or handakuten
 	cp "パ"
 	jr nc, .handakuten
-
-.dakuten
+; dakuten
 	cp FIRST_HIRAGANA_DAKUTEN_CHAR
 	jr nc, .hiragana_dakuten
+; katakana dakuten
 	add "カ" - "ガ"
-	jr .katakana_dakuten
+	jr .place_dakuten
+
 .hiragana_dakuten
 	add "か" - "が"
-.katakana_dakuten
+.place_dakuten
 	ld b, "ﾞ" ; dakuten
 	call Diacritic
 	jr .place
@@ -257,11 +258,13 @@ ENDM
 .handakuten
 	cp "ぱ"
 	jr nc, .hiragana_handakuten
+; katakana handakuten
 	add "ハ" - "パ"
-	jr .katakana_handakuten
+	jr .place_handakuten
+
 .hiragana_handakuten
 	add "は" - "ぱ"
-.katakana_handakuten
+.place_handakuten
 	ld b, "ﾟ" ; handakuten
 	call Diacritic
 

home/video.asm

@@ -159,7 +159,7 @@ UpdateBGMap::
 
 THIRD_HEIGHT EQU SCREEN_HEIGHT / 3
 
-.bottom
+; bottom
 	ld de, 2 * THIRD_HEIGHT * SCREEN_WIDTH
 	add hl, de
 	ld sp, hl
@@ -240,11 +240,11 @@ endr
 	ret
 
 Serve1bppRequest::
-	ld a, [wRequested1bpp]
+	ld a, [wRequested1bppSize]
 	and a
 	ret z
 
-; Copy [wRequested1bpp] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest]
+; Copy [wRequested1bppSize] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest]
 
 	ld [hSPBuffer], sp
 
@@ -262,11 +262,11 @@ Serve1bppRequest::
 	ld l, a
 
 ; # tiles to copy
-	ld a, [wRequested1bpp]
+	ld a, [wRequested1bppSize]
 	ld b, a
 
 	xor a
-	ld [wRequested1bpp], a
+	ld [wRequested1bppSize], a
 
 .next
 
@@ -309,11 +309,11 @@ endr
 	ret
 
 Serve2bppRequest::
-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	and a
 	ret z
 
-; Copy [wRequested2bpp] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]
+; Copy [wRequested2bppSize] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]
 
 	ld [hSPBuffer], sp
 
@@ -331,11 +331,11 @@ Serve2bppRequest::
 	ld l, a
 
 ; # tiles to copy
-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	ld b, a
 
 	xor a
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 
 .next
 

home/warp_connection.asm

@@ -497,8 +497,6 @@ EnterMapWarp::
 	ld a, c
 	cp TILESET_POKECENTER
 	ret nz
-
-.pokecenter
 	ld a, [wPrevMapGroup]
 	ld [wLastSpawnMapGroup], a
 	ld a, [wPrevMapNumber]

maps/AzaleaTown.asm

@@ -138,8 +138,7 @@ AzaleaTownSlowpokeScript:
 	closetext
 	end
 
-UnusedWoosterScript:
-; unused
+UnusedWoosterScript: ; unreferenced
 	faceplayer
 	opentext
 	writetext WoosterText

maps/BlackthornDragonSpeechHouse.asm

@@ -18,12 +18,10 @@ BlackthornDragonSpeechHouseDratiniScript:
 	closetext
 	end
 
-; unused
-BlackthornDragonSpeechHousePictureBookshelf:
+BlackthornDragonSpeechHousePictureBookshelf: ; unreferenced
 	jumpstd PictureBookshelfScript
 
-; unused
-BlackthornDragonSpeechHouseMagazineBookshelf:
+BlackthornDragonSpeechHouseMagazineBookshelf: ; unreferenced
 	jumpstd MagazineBookshelfScript
 
 BlackthornDragonSpeechHouseGrannyText:

maps/BlackthornGym1F.asm

@@ -251,7 +251,7 @@ BlackthornGymClairText_YouKeptMeWaiting:
 	line "this TM."
 	done
 
-BlackthornGymText_ReceivedTM24:
+BlackthornGymText_ReceivedTM24: ; unreferenced
 	text "<PLAYER> received"
 	line "TM24."
 	done

maps/BurnedTowerB1F.asm

@@ -65,7 +65,7 @@ ReleaseTheBeasts:
 	special InitRoamMons
 	end
 
-UnusedEnteiScript:
+UnusedEnteiScript: ; unreferenced
 	opentext
 	writetext UnusedEnteiText
 	cry ENTEI

maps/CeladonDeptStore6F.asm

@@ -93,8 +93,7 @@ CeladonDeptStore6FVendingMachine:
 CeladonDeptStore6FDirectory:
 	jumptext CeladonDeptStore6FDirectoryText
 
-; unused
-CeladonDeptStore6FElevatorButton:
+CeladonDeptStore6FElevatorButton: ; unreferenced
 	jumpstd ElevatorButtonScript
 
 CeladonVendingText:

maps/CeladonGameCorner.asm

@@ -141,8 +141,7 @@ CeladonGameCornerSodaCanScript:
 	closetext
 	end
 
-CeladonGameCornerUnusedMovementData:
-; unreferenced
+CeladonGameCornerUnusedMovementData: ; unreferenced
 	step RIGHT
 	turn_head LEFT
 	step_end

maps/CeladonMansion3F.asm

@@ -57,8 +57,7 @@ GameFreakGraphicArtistScript:
 	closetext
 	end
 
-.CancelPrinting:
-; unused
+.CancelPrinting: ; unreferenced
 	writetext GameFreakGraphicArtistErrorText
 	waitbutton
 	closetext