Comment, remove, or revise many unreferenced labels

2024-11-16 11:27:33 -08:00 · 2020-10-26 15:45:57 -04:00 · 2020-10-26 15:45:57 -04:00 · 9dcdad5e60
commit 9dcdad5e60
parent a2b6befd7d
180 changed files with 810 additions and 1032 deletions
--- a/audio/cries.asm
+++ b/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
--- a/audio/engine.asm
+++ b/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
--- a/audio/music/magnettrain.asm
+++ b/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
--- a/audio/sfx.asm
+++ b/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
@ -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
--- a/audio/sfx_pointers.asm
+++ b/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
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@ -1,5 +1,5 @@
 newgroup: MACRO
-const_value = const_value + 1
+	const_skip
 __map_value__ = 1
 ENDM

--- a/constants/map_data_constants.asm
+++ b/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
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@ -179,7 +179,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
--- a/constants/trainer_constants.asm
+++ b/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
--- a/data/battle_tower/parties.asm
+++ b/data/battle_tower/parties.asm
@ -1,7 +1,7 @@
 BattleTowerMons:
-; 10 groups of 21 mons.
+; 10 groups (one per floor level) of 21 mons (BATTLETOWER_NUM_UNIQUE_MON).

-BattleTowerMons1:
+; BattleTowerMons group 1

 	db JOLTEON
 	db MIRACLEBERRY
@ -550,7 +550,7 @@ BattleTowerMons1:
 	db "BARIYA-DO@@"


-BattleTowerMons2:
+; BattleTowerMons group 2

 	db UMBREON
 	db LEFTOVERS
@ -1099,7 +1099,7 @@ BattleTowerMons2:
 	db "NUO-@@@@@@@"


-BattleTowerMons3:
+; BattleTowerMons group 3

 	db JOLTEON
 	db MIRACLEBERRY
@ -1648,7 +1648,7 @@ BattleTowerMons3:
 	db "OKORIZARU@@"


-BattleTowerMons4:
+; BattleTowerMons group 4

 	db TAUROS
 	db GOLD_BERRY
@ -2197,7 +2197,7 @@ BattleTowerMons4:
 	db "EREBU-@@@@@"


-BattleTowerMons5:
+; BattleTowerMons group 5

 	db KINGDRA
 	db GOLD_BERRY
@ -2746,7 +2746,7 @@ BattleTowerMons5:
 	db "HURI-ZA-@@@"


-BattleTowerMons6:
+; BattleTowerMons group 6

 	db KINGDRA
 	db LEFTOVERS
@ -3295,7 +3295,7 @@ BattleTowerMons6:
 	db "GORO-NIya@@"


-BattleTowerMons7:
+; BattleTowerMons group 7

 	db JOLTEON
 	db MIRACLEBERRY
@ -3844,7 +3844,7 @@ BattleTowerMons7:
 	db "KAMEtuKUSU@"


-BattleTowerMons8:
+; BattleTowerMons group 8

 	db JOLTEON
 	db MIRACLEBERRY
@ -4393,7 +4393,7 @@ BattleTowerMons8:
 	db "GURANBURU@@"


-BattleTowerMons9:
+; BattleTowerMons group 9

 	db UMBREON
 	db KINGS_ROCK
@ -4942,7 +4942,7 @@ BattleTowerMons9:
 	db "BETOBETON@@"


-BattleTowerMons10:
+; BattleTowerMons group 10

 	db HOUNDOOM
 	db MINT_BERRY
--- a/data/battle_tower/unknown.asm
+++ b/data/battle_tower/unknown.asm
@ -1,8 +1,8 @@
-BattleTowerTrainerData:: ; What exactly it is, I don't know
-; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied)
+BattleTowerTrainerData:: ; ???
+; 70 tables (BATTLETOWER_NUM_UNIQUE_TRAINERS) of 18 two-argument entries (total size BATTLETOWER_TRAINERDATALENGTH).
 ; Second argument points to an entry in Unknown_170470, to which the first argument is compared.

-BattleTowerTrainer1DataTable:
+; BattleTowerTrainerData table 1:
 	db $37,  3
 	db $0e,  9
 	db $25, 11
@ -22,7 +22,7 @@ BattleTowerTrainer1DataTable:
 	db $34,  3
 	db $06,  5

-BattleTowerTrainer2DataTable:
+; BattleTowerTrainerData table 2:
 	db $36,  3
 	db $ca,  0
 	db $22,  8
@ -42,7 +42,7 @@ BattleTowerTrainer2DataTable:
 	db $28, 11
 	db $0c, 13

-BattleTowerTrainer3DataTable:
+; BattleTowerTrainerData table 3:
 	db $32,  6
 	db $31,  4
 	db $02,  2
@ -62,7 +62,7 @@ BattleTowerTrainer3DataTable:
 	db $22,  2
 	db $13, 13

-BattleTowerTrainer4DataTable:
+; BattleTowerTrainerData table 4:
 	db $22, 12
 	db $22, 12
 	db $0a,  9
@ -82,7 +82,7 @@ BattleTowerTrainer4DataTable:
 	db $1c, 11
 	db $41, 11

-BattleTowerTrainer5DataTable:
+; BattleTowerTrainerData table 5:
 	db $a3,  0
 	db $41,  3
 	db $1f,  4
@ -102,7 +102,7 @@ BattleTowerTrainer5DataTable:
 	db $d1,  0
 	db $0a,  6

-BattleTowerTrainer6DataTable:
+; BattleTowerTrainerData table 6:
 	db $13,  2
 	db $31,  6
 	db $04,  2
@ -122,7 +122,7 @@ BattleTowerTrainer6DataTable:
 	db $08,  5
 	db $1a, 13

-BattleTowerTrainer7DataTable:
+; BattleTowerTrainerData table 7:
 	db $0d,  2
 	db $07,  2
 	db $00,  5
@ -142,7 +142,7 @@ BattleTowerTrainer7DataTable:
 	db $20,  4
 	db $23, 13

-BattleTowerTrainer8DataTable:
+; BattleTowerTrainerData table 8:
 	db $1e,  2
 	db $22,  2
 	db $00,  5
@ -162,7 +162,7 @@ BattleTowerTrainer8DataTable:
 	db $14,  8
 	db $00,  5

-BattleTowerTrainer9DataTable:
+; BattleTowerTrainerData table 9:
 	db $06, 12
 	db $09,  6
 	db $00,  0
@ -182,7 +182,7 @@ BattleTowerTrainer9DataTable:
 	db $31, 13
 	db $01,  5

-BattleTowerTrainer10DataTable:
+; BattleTowerTrainerData table 10:
 	db $22, 12
 	db $30,  4
 	db $01,  5
@ -202,7 +202,7 @@ BattleTowerTrainer10DataTable:
 	db $30, 13
 	db $06,  5

-BattleTowerTrainer11DataTable:
+; BattleTowerTrainerData table 11:
 	db $0e,  6
 	db $04,  5
 	db $2c,  4
@ -222,7 +222,7 @@ BattleTowerTrainer11DataTable:
 	db $26, 13
 	db $04,  5

-BattleTowerTrainer12DataTable:
+; BattleTowerTrainerData table 12:
 	db $18,  2
 	db $33,  3
 	db $28,  4
@ -242,7 +242,7 @@ BattleTowerTrainer12DataTable:
 	db $0f,  2
 	db $00,  5

-BattleTowerTrainer13DataTable:
+; BattleTowerTrainerData table 13:
 	db $3a, 11
 	db $3a, 11
 	db $00,  5
@ -262,7 +262,7 @@ BattleTowerTrainer13DataTable:
 	db $3a,  8
 	db $2a, 13

-BattleTowerTrainer14DataTable:
+; BattleTowerTrainerData table 14:
 	db $31,  5
 	db $11, 14
 	db $30,  4
@ -282,7 +282,7 @@ BattleTowerTrainer14DataTable:
 	db $3b,  7
 	db $0e, 13

-BattleTowerTrainer15DataTable:
+; BattleTowerTrainerData table 15:
 	db $1b,  2
 	db $2c,  4
 	db $0d, 13
@ -302,7 +302,7 @@ BattleTowerTrainer15DataTable:
 	db $06,  5
 	db $00,  0

-BattleTowerTrainer16DataTable:
+; BattleTowerTrainerData table 16:
 	db $42,  3
 	db $30,  4
 	db $1f, 11
@ -322,7 +322,7 @@ BattleTowerTrainer16DataTable:
 	db $36,  8
 	db $41, 13

-BattleTowerTrainer17DataTable:
+; BattleTowerTrainerData table 17:
 	db $18,  3
 	db $42,  3
 	db $43,  4
@ -342,7 +342,7 @@ BattleTowerTrainer17DataTable:
 	db $3f,  4
 	db $20, 14

-BattleTowerTrainer18DataTable:
+; BattleTowerTrainerData table 18:
 	db $0c,  5
 	db $36,  7
 	db $30,  4
@ -362,7 +362,7 @@ BattleTowerTrainer18DataTable:
 	db $30,  7
 	db $06,  5

-BattleTowerTrainer19DataTable:
+; BattleTowerTrainerData table 19:
 	db $36,  3
 	db $06,  6
 	db $44,  4
@ -382,7 +382,7 @@ BattleTowerTrainer19DataTable:
 	db $05, 13
 	db $00,  0

-BattleTowerTrainer20DataTable:
+; BattleTowerTrainerData table 20:
 	db $3f,  6
 	db $2c,  4
 	db $34, 13
@ -402,7 +402,7 @@ BattleTowerTrainer20DataTable:
 	db $34,  7
 	db $04, 13

-BattleTowerTrainer21DataTable:
+; BattleTowerTrainerData table 21:
 	db $12,  3
 	db $02,  4
 	db $07,  7
@ -422,7 +422,7 @@ BattleTowerTrainer21DataTable:
 	db $28, 11
 	db $02,  5

-BattleTowerTrainer22DataTable:
+; BattleTowerTrainerData table 22:
 	db $41,  4
 	db $3c, 11
 	db $34, 13
@ -442,7 +442,7 @@ BattleTowerTrainer22DataTable:
 	db $0c,  4
 	db $3b, 13

-BattleTowerTrainer23DataTable:
+; BattleTowerTrainerData table 23:
 	db $03, 10
 	db $3a, 13
 	db $2c,  4
@ -462,7 +462,7 @@ BattleTowerTrainer23DataTable:
 	db $13,  4
 	db $04,  5

-BattleTowerTrainer24DataTable:
+; BattleTowerTrainerData table 24:
 	db $06,  5
 	db $06,  5
 	db $06,  5
@ -482,7 +482,7 @@ BattleTowerTrainer24DataTable:
 	db $33,  4
 	db $03,  5

-BattleTowerTrainer25DataTable:
+; BattleTowerTrainerData table 25:
 	db $27,  5
 	db $01,  5
 	db $00,  0
@ -502,7 +502,7 @@ BattleTowerTrainer25DataTable:
 	db $0c,  4
 	db $19, 13

-BattleTowerTrainer26DataTable:
+; BattleTowerTrainerData table 26:
 	db $03,  2
 	db $43,  3
 	db $27,  4
@ -522,7 +522,7 @@ BattleTowerTrainer26DataTable:
 	db $20,  4
 	db $41, 13

-BattleTowerTrainer27DataTable:
+; BattleTowerTrainerData table 27:
 	db $34,  3
 	db $00,  3
 	db $11, 13
@ -542,7 +542,7 @@ BattleTowerTrainer27DataTable:
 	db $0d,  6
 	db $20,  6

-BattleTowerTrainer28DataTable:
+; BattleTowerTrainerData table 28:
 	db $19,  3
 	db $17, 11
 	db $20,  6
@ -562,7 +562,7 @@ BattleTowerTrainer28DataTable:
 	db $06, 12
 	db $1a, 11

-BattleTowerTrainer29DataTable:
+; BattleTowerTrainerData table 29:
 	db $0a,  3
 	db $0c, 12
 	db $25, 10
@ -582,7 +582,7 @@ BattleTowerTrainer29DataTable:
 	db $0a,  9
 	db $2f, 13

-BattleTowerTrainer30DataTable:
+; BattleTowerTrainerData table 30:
 	db $15,  2
 	db $2c,  4
 	db $03,  2
@ -602,7 +602,7 @@ BattleTowerTrainer30DataTable:
 	db $0c,  4
 	db $3b, 13

-BattleTowerTrainer31DataTable:
+; BattleTowerTrainerData table 31:
 	db $10, 11
 	db $04,  4
 	db $00,  5
@ -622,7 +622,7 @@ BattleTowerTrainer31DataTable:
 	db $13,  7
 	db $16, 13

-BattleTowerTrainer32DataTable:
+; BattleTowerTrainerData table 32:
 	db $0f, 14
 	db $19, 13
 	db $00,  5
@ -642,7 +642,7 @@ BattleTowerTrainer32DataTable:
 	db $19, 13
 	db $01,  5

-BattleTowerTrainer33DataTable:
+; BattleTowerTrainerData table 33:
 	db $35,  3
 	db $06,  4
 	db $0d,  6
@ -662,7 +662,7 @@ BattleTowerTrainer33DataTable:
 	db $29,  8
 	db $03,  5

-BattleTowerTrainer34DataTable:
+; BattleTowerTrainerData table 34:
 	db $18,  4
 	db $03,  5
 	db $0b, 13
@ -682,7 +682,7 @@ BattleTowerTrainer34DataTable:
 	db $0c,  6
 	db $1a, 13

-BattleTowerTrainer35DataTable:
+; BattleTowerTrainerData table 35:
 	db $0c, 12
 	db $37,  3
 	db $1a,  3
@ -702,7 +702,7 @@ BattleTowerTrainer35DataTable:
 	db $3b,  8
 	db $1b,  7

-BattleTowerTrainer36DataTable:
+; BattleTowerTrainerData table 36:
 	db $18,  3
 	db $1b,  8
 	db $29, 11
@ -722,7 +722,7 @@ BattleTowerTrainer36DataTable:
 	db $2f,  8
 	db $27,  6

-BattleTowerTrainer37DataTable:
+; BattleTowerTrainerData table 37:
 	db $1c,  3
 	db $02, 14
 	db $31,  3
@ -742,7 +742,7 @@ BattleTowerTrainer37DataTable:
 	db $27,  4
 	db $34, 13

-BattleTowerTrainer38DataTable:
+; BattleTowerTrainerData table 38:
 	db $33,  3
 	db $30,  4
 	db $2c,  4
@ -762,7 +762,7 @@ BattleTowerTrainer38DataTable:
 	db $40,  6
 	db $22,  7

-BattleTowerTrainer39DataTable:
+; BattleTowerTrainerData table 39:
 	db $22, 12
 	db $22, 12
 	db $16, 10
@ -782,7 +782,7 @@ BattleTowerTrainer39DataTable:
 	db $2c,  4
 	db $26,  7

-BattleTowerTrainer40DataTable:
+; BattleTowerTrainerData table 40:
 	db $0e,  6
 	db $05,  8
 	db $04, 13
@ -802,7 +802,7 @@ BattleTowerTrainer40DataTable:
 	db $00,  0
 	db $00,  0

-BattleTowerTrainer41DataTable:
+; BattleTowerTrainerData table 41:
 	db $18,  3
 	db $27,  3
 	db $03,  5
@ -822,7 +822,7 @@ BattleTowerTrainer41DataTable:
 	db $2f,  8
 	db $06,  5

-BattleTowerTrainer42DataTable:
+; BattleTowerTrainerData table 42:
 	db $36,  3
 	db $30,  4
 	db $17,  4
@ -842,7 +842,7 @@ BattleTowerTrainer42DataTable:
 	db $07, 13
 	db $3b, 13

-BattleTowerTrainer43DataTable:
+; BattleTowerTrainerData table 43:
 	db $0b,  5
 	db $14,  6
 	db $24,  4
@ -862,7 +862,7 @@ BattleTowerTrainer43DataTable:
 	db $00,  2
 	db $07,  5

-BattleTowerTrainer44DataTable:
+; BattleTowerTrainerData table 44:
 	db $0a,  3
 	db $32,  7
 	db $0b, 14
@ -882,7 +882,7 @@ BattleTowerTrainer44DataTable:
 	db $1e,  6
 	db $14,  7

-BattleTowerTrainer45DataTable:
+; BattleTowerTrainerData table 45:
 	db $0e,  6
 	db $2c,  4
 	db $00, 13
@ -902,7 +902,7 @@ BattleTowerTrainer45DataTable:
 	db $31,  4
 	db $21, 13

-BattleTowerTrainer46DataTable:
+; BattleTowerTrainerData table 46:
 	db $22,  5
 	db $07, 14
 	db $30,  4
@ -922,7 +922,7 @@ BattleTowerTrainer46DataTable:
 	db $3f,  4
 	db $06,  5

-BattleTowerTrainer47DataTable:
+; BattleTowerTrainerData table 47:
 	db $3a,  7
 	db $3b,  7
 	db $36,  3
@ -942,7 +942,7 @@ BattleTowerTrainer47DataTable:
 	db $3f,  4
 	db $0c, 13

-BattleTowerTrainer48DataTable:
+; BattleTowerTrainerData table 48:
 	db $43,  3
 	db $20,  4
 	db $41, 13
@ -962,7 +962,7 @@ BattleTowerTrainer48DataTable:
 	db $39,  4
 	db $41, 13

-BattleTowerTrainer49DataTable:
+; BattleTowerTrainerData table 49:
 	db $36,  3
 	db $16,  4
 	db $08,  6
@ -982,7 +982,7 @@ BattleTowerTrainer49DataTable:
 	db $2c, 13
 	db $00,  5

-BattleTowerTrainer50DataTable:
+; BattleTowerTrainerData table 50:
 	db $11,  5
 	db $25,  3
 	db $33,  4
@ -1002,7 +1002,7 @@ BattleTowerTrainer50DataTable:
 	db $19, 13
 	db $06,  5

-BattleTowerTrainer51DataTable:
+; BattleTowerTrainerData table 51:
 	db $2c,  4
 	db $0a, 13
 	db $04,  5
@ -1022,7 +1022,7 @@ BattleTowerTrainer51DataTable:
 	db $29,  8
 	db $05, 13

-BattleTowerTrainer52DataTable:
+; BattleTowerTrainerData table 52:
 	db $05,  3
 	db $1b,  4
 	db $41,  3
@ -1042,7 +1042,7 @@ BattleTowerTrainer52DataTable:
 	db $1d, 11
 	db $03,  5

-BattleTowerTrainer53DataTable:
+; BattleTowerTrainerData table 53:
 	db $1c, 12
 	db $20,  6
 	db $05,  8
@ -1062,7 +1062,7 @@ BattleTowerTrainer53DataTable:
 	db $06,  5
 	db $1f,  8

-BattleTowerTrainer54DataTable:
+; BattleTowerTrainerData table 54:
 	db $37,  3
 	db $0e,  1
 	db $08,  1
@ -1082,7 +1082,7 @@ BattleTowerTrainer54DataTable:
 	db $41,  8
 	db $3b, 13

-BattleTowerTrainer55DataTable:
+; BattleTowerTrainerData table 55:
 	db $06,  2
 	db $00,  5
 	db $34,  3
@ -1102,7 +1102,7 @@ BattleTowerTrainer55DataTable:
 	db $1b,  4
 	db $0c, 13

-BattleTowerTrainer56DataTable:
+; BattleTowerTrainerData table 56:
 	db $2c,  4
 	db $13,  9
 	db $20,  6
@ -1122,7 +1122,7 @@ BattleTowerTrainer56DataTable:
 	db $06, 13
 	db $3b, 13

-BattleTowerTrainer57DataTable:
+; BattleTowerTrainerData table 57:
 	db $06,  3
 	db $20,  4
 	db $24, 13
@ -1142,7 +1142,7 @@ BattleTowerTrainer57DataTable:
 	db $09,  6
 	db $06,  5

-BattleTowerTrainer58DataTable:
+; BattleTowerTrainerData table 58:
 	db $44,  7
 	db $23, 11
 	db $33, 13
@ -1162,7 +1162,7 @@ BattleTowerTrainer58DataTable:
 	db $11,  8
 	db $41, 13

-BattleTowerTrainer59DataTable:
+; BattleTowerTrainerData table 59:
 	db $36,  3
 	db $06,  6
 	db $30,  4
@ -1182,7 +1182,7 @@ BattleTowerTrainer59DataTable:
 	db $0b,  6
 	db $27,  6

-BattleTowerTrainer60DataTable:
+; BattleTowerTrainerData table 60:
 	db $14,  5
 	db $04,  2
 	db $09, 14
@ -1202,7 +1202,7 @@ BattleTowerTrainer60DataTable:
 	db $39,  4
 	db $00,  5

-BattleTowerTrainer61DataTable:
+; BattleTowerTrainerData table 61:
 	db $34,  3
 	db $00,  3
 	db $11, 13
@ -1222,7 +1222,7 @@ BattleTowerTrainer61DataTable:
 	db $1e,  6
 	db $14, 13

-BattleTowerTrainer62DataTable:
+; BattleTowerTrainerData table 62:
 	db $37,  5
 	db $37,  5
 	db $00,  5
@ -1242,7 +1242,7 @@ BattleTowerTrainer62DataTable:
 	db $16,  5
 	db $01,  5

-BattleTowerTrainer63DataTable:
+; BattleTowerTrainerData table 63:
 	db $1f, 14
 	db $36,  4
 	db $40, 13
@ -1262,7 +1262,7 @@ BattleTowerTrainer63DataTable:
 	db $27, 13
 	db $00,  0

-BattleTowerTrainer64DataTable:
+; BattleTowerTrainerData table 64:
 	db $41,  8
 	db $0b,  6
 	db $37,  3
@ -1282,7 +1282,7 @@ BattleTowerTrainer64DataTable:
 	db $28,  6
 	db $06,  5

-BattleTowerTrainer65DataTable:
+; BattleTowerTrainerData table 65:
 	db $0c,  8
 	db $2c,  4
 	db $1c, 11
@ -1302,7 +1302,7 @@ BattleTowerTrainer65DataTable:
 	db $20,  6
 	db $22,  7

-BattleTowerTrainer66DataTable:
+; BattleTowerTrainerData table 66:
 	db $22, 12
 	db $22, 12
 	db $0a,  9
@ -1322,7 +1322,7 @@ BattleTowerTrainer66DataTable:
 	db $02,  7
 	db $04,  5

-BattleTowerTrainer67DataTable:
+; BattleTowerTrainerData table 67:
 	db $2d, 11
 	db $02,  8
 	db $37, 13
@ -1342,7 +1342,7 @@ BattleTowerTrainer67DataTable:
 	db $10,  5
 	db $04,  5

-BattleTowerTrainer68DataTable:
+; BattleTowerTrainerData table 68:
 	db $3f,  3
 	db $16, 14
 	db $3f,  8
@ -1362,7 +1362,7 @@ BattleTowerTrainer68DataTable:
 	db $26,  7
 	db $03,  5

-BattleTowerTrainer69DataTable:
+; BattleTowerTrainerData table 69:
 	db $3a,  6
 	db $2c,  3
 	db $12,  3
@ -1382,7 +1382,7 @@ BattleTowerTrainer69DataTable:
 	db $1b,  7
 	db $00,  5

-BattleTowerTrainer70DataTable:
+; BattleTowerTrainerData table 70:
 	db $1b,  2
 	db $00,  5
 	db $0c,  8
@ -1401,4 +1401,3 @@ BattleTowerTrainer70DataTable:
 	db $22,  7
 	db $d1,  0
 	db $32, 13
-BattleTowerTrainerDataEnd:
--- a/data/decorations/decorations.asm
+++ b/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
--- a/data/maps/blocks.asm
+++ b/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"

 RuinsOfAlphInnerChamber_Blocks:
@ -493,19 +493,19 @@ RuinsOfAlphAerodactylChamber_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:
@ -1040,7 +1040,7 @@ BattleTowerElevator_Blocks:
 BattleTowerOutside_Blocks:
 	INCBIN "maps/BattleTowerOutside.blk"

-BetaBlank_Blocks:
+BetaBlank_Blocks: ; unreferenced
 	INCBIN "maps/unused/BetaBlank.blk"

 GoldenrodDeptStoreRoof_Blocks:
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@ -128,7 +128,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@"
@ -144,11 +144,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@"
@ -199,7 +199,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@"
--- a/data/moves/animations.asm
+++ b/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
@ -4106,7 +4106,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

--- a/data/phone/text/elm.asm
+++ b/data/phone/text/elm.asm
@ -197,7 +197,6 @@ ElmPhoneGiftText:
 	para "See you later!"
 	done

-; unused
 ElmPhoneGotAholdOfSomethingNeatText:
 	text "Hello, <PLAY_G>?"
 	line "How's it going?"
--- a/data/phone/text/todd_overworld.asm
+++ b/data/phone/text/todd_overworld.asm
@ -57,9 +57,8 @@ ToddRematchText:
 	line "my #MON better!"
 	done

-UnusedText_0xa43ca:
-; This is unused; Todd says this during the department store sale,
-; but this is a duplicate of the actual string in the Route 34 scripts.
+ToddSaleText: ; unreferenced
+; This is a duplicate of CamperToddSaleText in maps/Route34.asm.
 	text "Shopping under the"
 	line "sky!"

--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@ -1102,7 +1102,7 @@ BattleText_LinkErrorBattleCanceled:
 	line "been canceled…"
 	prompt

-BattleText_0x8188e:
+BattleText_NoTimeLeftToday: ; unreferenced
 	text "There is no time"
 	line "left today!"
 	done
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@ -463,7 +463,6 @@ _MobileForPartnersMonText::
 	text "."
 	done

-; unreferenced
 _MobilePlayersMonTradeText::
 	text_ram wPlayerTrademonSenderName
 	text "'s"
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@ -263,12 +263,12 @@ _MysteryGiftSentHomeText::
 _MysteryGiftReceivedCardText::
 	text "Received"
 	line "@"
-	text_ram wc850
+	text_ram wMysteryGiftCardHolderName
 	text "'s CARD."
 	prompt

 _MysteryGiftListedCardText::
-	text_ram wc850
+	text_ram wMysteryGiftCardHolderName
 	text "'s CARD was"
 	line "listed as no.@"
 	text_decimal wDeciramBuffer, 1, 2
@ -487,7 +487,6 @@ _RodNothingText::
 	text "Not even a nibble!"
 	prompt

-; unreferenced
 _UnusedNothingHereText::
 	text "Looks like there's"
 	line "nothing here."
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@ -620,7 +620,6 @@ _PharmacyComeAgainText::
 	line "See you around."
 	done

-; unreferenced
 _NothingToSellText::
 	text "You don't have"
 	line "anything to sell."
@ -744,25 +743,21 @@ _MainMenuTimeUnknownText::
 	text "Clock time unknown"
 	done

-; unreferenced mobile
 _DeleteSavedLoginPasswordText::
 	text "Delete the saved"
 	line "LOG-IN PASSWORD?"
 	done

-; unreferenced mobile
 _DeletedTheLoginPasswordText::
 	text "Deleted the LOG-IN"
 	line "PASSWORD."
 	done

-; unreferenced mobile
 _MobilePickThreeMonForBattle::
 	text "Pick three #MON"
 	line "for battle."
 	prompt

-; unreferenced mobile
 _MobileUseTheseThreeMonText::
 	text_ram wMobileParticipant1Nickname
 	text ","
@ -776,13 +771,11 @@ _MobileUseTheseThreeMonText::
 	para "Use these three?"
 	done

-; unreferenced mobile
 _MobileOnlyThreeMonMayEnterText::
 	text "Only three #MON"
 	line "may enter."
 	prompt

-; unreferenced mobile
 _MobileCardFolderIntro1Text::
 	text "The CARD FOLDER"
 	line "stores your and"
@ -800,7 +793,6 @@ _MobileCardFolderIntro1Text::
 	para ""
 	done

-; unreferenced mobile
 _MobileCardFolderIntro2Text::
 	text "This is your CARD."

@ -814,7 +806,6 @@ _MobileCardFolderIntro2Text::
 	para ""
 	done

-; unreferenced mobile
 _MobileCardFolderIntro3Text::
 	text "If you have your"
 	line "friend's CARD, you"
@ -829,7 +820,6 @@ _MobileCardFolderIntro3Text::
 	para ""
 	done

-; unreferenced mobile
 _MobileCardFolderIntro4Text::
 	text "To safely store"
 	line "your collection of"
@ -841,7 +831,6 @@ _MobileCardFolderIntro4Text::
 	para ""
 	done

-; unreferenced mobile
 _MobileCardFolderAskDeleteText::
 	text "If the CARD FOLDER"
 	line "is deleted, all"
@ -858,13 +847,11 @@ _MobileCardFolderAskDeleteText::
 	line "your CARD FOLDER?"
 	done

-; unreferenced mobile
 _MobileCardFolderDeleteAreYouSureText::
 	text "Are you sure you"
 	line "want to delete it?"
 	done

-; unreferenced mobile
 _MobileCardFolderDeletedText::
 	text "The CARD FOLDER"
 	line "has been deleted."
@ -872,7 +859,6 @@ _MobileCardFolderDeletedText::
 	para ""
 	done

-; unreferenced mobile
 _MobileCardFolderAskOpenOldText::
 	text "There is an older"
 	line "CARD FOLDER from a"
@ -882,13 +868,11 @@ _MobileCardFolderAskOpenOldText::
 	line "open it?"
 	done

-; unreferenced mobile
 _MobileCardFolderAskDeleteOldText::
 	text "Delete the old"
 	line "CARD FOLDER?"
 	done

-; unreferenced mobile
 _MobileCardFolderFinishRegisteringCardsText::
 	text "Finish registering"
 	line "CARDS?"
--- a/data/text/unused_sweet_honey.asm
+++ b/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
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@ -20,8 +20,9 @@ AI_SwitchOrTryItem:
 	and a
 	jr nz, DontSwitch

+	; always load the first trainer class in wTrainerClass for Battle Tower trainers
 	ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
-	ld a, [wInBattleTowerBattle] ; always load the first trainer class in wTrainerClass for BattleTower-Trainers
+	ld a, [wInBattleTowerBattle]
 	and a
 	jr nz, .ok

@ -29,6 +30,7 @@ AI_SwitchOrTryItem:
 	dec a
 	ld bc, NUM_TRAINER_ATTRIBUTES
 	call AddNTimes
+
 .ok
 	bit SWITCH_OFTEN_F, [hl]
 	jp nz, SwitchOften
@ -145,13 +147,13 @@ SwitchSometimes:
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch

-CheckSubstatusCantRun:
+CheckSubstatusCantRun: ; unreferenced
 	ld a, [wEnemySubStatus5]
 	bit SUBSTATUS_CANT_RUN, a
 	ret

 AI_TryItem:
-	; items are not allowed in the BattleTower
+	; items are not allowed in the Battle Tower
 	ld a, [wInBattleTowerBattle]
 	and a
 	ret nz
@ -213,7 +215,7 @@ AI_TryItem:
 	inc hl
 	jr c, .loop

-.used_item
+; used item
 	xor a
 	ld [de], a
 	inc a
@ -259,7 +261,7 @@ AI_TryItem:
 	cp e
 	jr nc, .yes

-.no
+.no ; unreferenced
 	and a
 	ret

--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@ -449,7 +449,7 @@ ENDM
 	spin_quadrant LOWER_LEFT,  .wedge1,  1, 11
 	db -1

-.load
+.load:
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@ -1697,7 +1697,7 @@ HandleWeather:
 	cp USING_EXTERNAL_CLOCK
 	jr z, .enemy_first

-.player_first
+; player first
 	call SetPlayerTurn
 	call .SandstormDamage
 	call SetEnemyTurn
@ -2711,7 +2711,7 @@ AskUseNextPokemon:
 ForcePlayerMonChoice:
 	call EmptyBattleTextbox
 	call LoadStandardMenuHeader
-	call SetUpBattlePartyMenu_NoLoop
+	call SetUpBattlePartyMenu
 	call ForcePickPartyMonInBattle
 	ld a, [wLinkMode]
 	and a
@ -2810,9 +2810,9 @@ IsMobileBattle:
 	cp LINK_MOBILE
 	ret

-SetUpBattlePartyMenu_NoLoop:
+SetUpBattlePartyMenu:
 	call ClearBGPalettes
-SetUpBattlePartyMenu: ; switch to fullscreen menu?
+SetUpBattlePartyMenu_Loop: ; switch to fullscreen menu?
 	farcall LoadPartyMenuGFX
 	farcall InitPartyMenuWithCancel
 	farcall InitPartyMenuBGPal7
@ -3486,7 +3486,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]
@ -5043,7 +5043,7 @@ BattleMenuPKMN_ReturnFromStats:
 	call LoadStandardMenuHeader
 	call ClearBGPalettes
 BattleMenuPKMN_Loop:
-	call SetUpBattlePartyMenu
+	call SetUpBattlePartyMenu_Loop
 	xor a
 	ld [wPartyMenuActionText], a
 	call JumpToPartyMenuAndPrintText
@ -8952,13 +8952,13 @@ InitBattleDisplay:
 	ldh [rSVBK], a

 	ld hl, wDecompressScratch
-	ld bc, wScratchAttrmap - wDecompressScratch
+	ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT
 	ld a, " "
 	call ByteFill

 	ld de, wDecompressScratch
 	hlbgcoord 0, 0
-	lb bc, BANK(.BlankBGMap), $40
+	lb bc, BANK(@), (BG_MAP_WIDTH * BG_MAP_HEIGHT) / LEN_2BPP_TILE
 	call Request2bpp

 	pop af
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@ -134,7 +134,7 @@ BattleCommand_CheckTurn:
 	and a
 	jp nz, CheckEnemyTurn

-CheckPlayerTurn:
+; check player turn
 	ld hl, wPlayerSubStatus4
 	bit SUBSTATUS_RECHARGE, [hl]
 	jr z, .no_recharge
@ -2586,7 +2586,7 @@ PlayerAttackDamage:
 	cp SPECIAL
 	jr nc, .special

-.physical
+; physical
 	ld hl, wEnemyMonDefense
 	ld a, [hli]
 	ld b, a
@ -2826,9 +2826,9 @@ EnemyAttackDamage:

 	ld a, [hl]
 	cp SPECIAL
-	jr nc, .Special
+	jr nc, .special

-.physical
+; physical
 	ld hl, wBattleMonDefense
 	ld a, [hli]
 	ld b, a
@ -2852,7 +2852,7 @@ EnemyAttackDamage:
 	ld hl, wEnemyAttack
 	jr .thickclub

-.Special:
+.special
 	ld hl, wBattleMonSpclDef
 	ld a, [hli]
 	ld b, a
@ -6124,7 +6124,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
@ -6147,7 +6147,7 @@ BattleCommand_ResetStats:
 	jp StdBattleTextbox

 .Fill:
-	ld b, wPlayerStatLevelsEnd - wPlayerStatLevels
+	ld b, NUM_LEVEL_STATS
 .next
 	ld [hli], a
 	dec b
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
@ -9,8 +9,7 @@ LoadBattleMenu:
 	call ExitMenu
 	ret

-SafariBattleMenu:
-; untranslated
+SafariBattleMenu: ; unreferenced
 	ld hl, SafariBattleMenuHeader
 	call LoadMenuHeader
 	jr CommonBattleMenu
@ -18,7 +17,8 @@ SafariBattleMenu:
 ContestBattleMenu:
 	ld hl, ContestBattleMenuHeader
 	call LoadMenuHeader
-; fallthrough
+	; fallthrough
+
 CommonBattleMenu:
 	ld a, [wBattleMenuCursorBuffer]
 	ld [wMenuCursorBuffer], a
--- a/engine/battle/move_effects/baton_pass.asm
+++ b/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

--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@ -1050,7 +1050,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
@ -1058,7 +1058,7 @@ GetMinimizePic:
 	ret

 .player
-	ld de, sScratch + $160
+	ld de, sScratch + (3 * 6 + 4) tiles
 	call CopyMinimizePic
 	ld hl, vTiles2 tile $31
 	ld de, sScratch
--- a/engine/battle_anims/core.asm
+++ b/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
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@ -4299,14 +4299,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
--- a/engine/debug/color_picker.asm
+++ b/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
@ -1069,7 +1069,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
--- a/engine/debug/debug_room.asm
+++ b/engine/debug/debug_room.asm
@ -1328,9 +1328,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]@"
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@ -67,7 +67,7 @@ Function170114:
 	call Function170c8b
 	ret

-Function170139:
+Function170139: ; unreferenced
 ; Convert the 4-digit decimal number at s5_aa41 into binary
 	ld a, BANK(s5_aa41)
 	call OpenSRAM
@ -374,7 +374,7 @@ ReadBTTrainerParty:
 	ld [bc], a
 	ret

-ValidateBTParty:
+ValidateBTParty: ; unreferenced
 ; Check for and fix errors in party data
 	ld hl, wBT_OTTempMon1Species
 	ld d, BATTLETOWER_PARTY_LENGTH
@ -386,7 +386,7 @@ ValidateBTParty:
 	ld a, [hl]
 	and a
 x = $ff
-rept ($ff - NUM_POKEMON)
+rept $ff - NUM_POKEMON
 	jr z, .invalid
 	cp x
 x = x - 1
--- a/engine/events/battle_tower/load_trainer.asm
+++ b/engine/events/battle_tower/load_trainer.asm
@ -95,7 +95,7 @@ Function_LoadRandomBattleTowerMon:
 	ld c, BATTLETOWER_PARTY_LENGTH
 .loop
 	push bc
-	ld a, BANK(sBTMonPrevTrainer1)
+	ld a, BANK(sBTMonOfTrainers)
 	call OpenSRAM

 .FindARandomBattleTowerMon:
--- a/engine/events/buena.asm
+++ b/engine/events/buena.asm
@ -85,7 +85,7 @@ BuenaPrize:
 	call Buena_PrizeMenu
 	jr z, .done
 	ld [wMenuSelectionQuantity], a
-	call Buena_getprize
+	call Buena_GetPrize
 	ld a, [hl]
 	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
@ -95,7 +95,7 @@ BuenaPrize:
 	jr c, .loop

 	ld a, [wMenuSelectionQuantity]
-	call Buena_getprize
+	call Buena_GetPrize
 	inc hl
 	ld a, [hld]
 	ld c, a
@ -258,11 +258,11 @@ Buena_PrizeMenu:
 	db SCROLLINGMENU_DISPLAY_ARROWS ; flags
 	db 4, 13 ; rows, columns
 	db SCROLLINGMENU_ITEMS_NORMAL ; item format
-	dba .indices
-	dba .prizeitem
-	dba .prizepoints
+	dba .Prizes
+	dba .PrintPrizeItem
+	dba .PrintPrizePoints

-.indices:
+.Prizes:
 	db NUM_BUENA_PRIZES
 x = 1
 rept NUM_BUENA_PRIZES
@ -271,9 +271,9 @@ x = x + 1
 endr
 	db -1

-.prizeitem:
+.PrintPrizeItem:
 	ld a, [wMenuSelection]
-	call Buena_getprize
+	call Buena_GetPrize
 	ld a, [hl]
 	push de
 	ld [wNamedObjectIndexBuffer], a
@ -282,9 +282,9 @@ endr
 	call PlaceString
 	ret

-.prizepoints:
+.PrintPrizePoints:
 	ld a, [wMenuSelection]
-	call Buena_getprize
+	call Buena_GetPrize
 	inc hl
 	ld a, [hl]
 	ld c, "0"
@ -292,7 +292,7 @@ endr
 	ld [de], a
 	ret

-Buena_getprize:
+Buena_GetPrize:
 	dec a
 	ld hl, BuenaPrizeItems
 	ld b, 0
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@ -1,6 +1,6 @@
 SPECIALCELEBIEVENT_CELEBI EQU $84

-UnusedForestTreeFrames:
+UnusedForestTreeFrames: ; unreferenced
 INCBIN "gfx/tilesets/forest-tree/1.2bpp"
 INCBIN "gfx/tilesets/forest-tree/2.2bpp"
 INCBIN "gfx/tilesets/forest-tree/3.2bpp"
@ -99,8 +99,7 @@ CelebiEvent_CountDown:
 	set 7, [hl]
 	ret

-CelebiEvent_SpawnLeaf:
-; unused
+CelebiEvent_SpawnLeaf: ; unreferenced
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@ -166,7 +166,7 @@ DayCareAskDepositPokemon:
 	scf
 	ret

-.DaycareDummyText:
+.DaycareDummyText: ; unreferenced
 	text_far _DaycareDummyText
 	text_end

--- a/engine/events/engine_flags.asm
+++ b/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
--- a/engine/events/heal_machine_anim.asm
+++ b/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
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@ -69,7 +69,7 @@ MagnetTrain:
 	ld [wRequested2bppSource + 1], a
 	ld [wRequested2bppDest], a
 	ld [wRequested2bppDest + 1], a
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 	call ClearTilemap

 	pop af
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@ -1414,7 +1414,7 @@ HasRockSmash:
 	ld d, ROCK_SMASH
 	call CheckPartyMove
 	jr nc, .yes
-.no
+; no
 	ld a, 1
 	jr .done
 .yes
@ -1616,7 +1616,7 @@ RodNothingText:
 	text_far _RodNothingText
 	text_end

-UnusedNothingHereText: ; unused
+UnusedNothingHereText: ; unreferenced
 	text_far _UnusedNothingHereText
 	text_end

--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@ -149,6 +149,6 @@ DoPoisonStep::
 	text_far _PoisonFaintText
 	text_end

-.PoisonWhiteoutText:
+.PoisonWhiteoutText: ; unreferenced
 	text_far _PoisonWhiteoutText
 	text_end
--- a/engine/events/print_unown_2.asm
+++ b/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
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@ -380,17 +380,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
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@ -210,7 +210,7 @@ GetTreeScore:
 	cp 5
 	jr c, .good

-.bad
+; bad
 	xor a ; TREEMON_SCORE_BAD
 	ret

--- a/engine/games/card_flip.asm
+++ b/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
--- a/engine/games/dummy_game.asm
+++ b/engine/games/dummy_game.asm
@ -20,7 +20,7 @@ _DummyGame:
 	ld a, BANK(DummyGameGFX)
 	call FarCopyBytes
 	ld a, $8
-	ld hl, wc300
+	ld hl, wSpriteAnimDict
 	ld [hli], a
 	ld [hl], $0
 	hlcoord 0, 0
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@ -326,7 +326,7 @@ Function9009: ; unreferenced
 	call LoadHLPaletteIntoDE
 	jr .GotPalette

-.GetMonPalette:
+.GetMonPalette: ; unreferenced
 	ld bc, wTempMonDVs
 	call GetPlayerOrMonPalettePointer
 	call LoadPalette_White_Col1_Col2_Black
--- a/engine/gfx/color.asm
+++ b/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

@ -977,7 +977,7 @@ PushSGBBorder:

 .LoadSGBBorderPointers:
 	ld hl, SGBBorderGFX
-	ld de, SGBBorderMap
+	ld de, SGBBorderMapAndPalettes
 	ret

 SGB_ClearVRAM:
@ -1174,12 +1174,10 @@ INCLUDE "data/sgb_ctrl_packets.asm"
 PredefPals:
 INCLUDE "gfx/sgb/predef.pal"

-SGBBorderMap:
+SGBBorderMapAndPalettes:
 ; interleaved tile ids and palette ids, without the center 20x18 screen area
 INCBIN "gfx/sgb/sgb_border.sgb.tilemap"
-
-SGBBorderPalettes:
-; assumed to come after SGBBorderMap
+; four SGB palettes of 16 colors each; only the first 4 colors are used
 INCLUDE "gfx/sgb/sgb_border.pal"

 SGBBorderGFX:
@ -1317,7 +1315,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"

 UnusedGSTitleBGPals:
--- a/engine/gfx/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
@ -113,10 +113,10 @@ GetCardPic:
 	ld bc, $23 tiles
 	ld a, BANK(ChrisCardPic) ; aka BANK(KrisCardPic)
 	call FarCopyBytes
-	ld hl, CardGFX
+	ld hl, TrainerCardGFX
 	ld de, vTiles2 tile $23
 	ld bc, 6 tiles
-	ld a, BANK(CardGFX)
+	ld a, BANK(TrainerCardGFX)
 	call FarCopyBytes
 	ret

@ -126,7 +126,7 @@ INCBIN "gfx/trainer_card/chris_card.2bpp"
 KrisCardPic:
 INCBIN "gfx/trainer_card/kris_card.2bpp"

-CardGFX:
+TrainerCardGFX:
 INCBIN "gfx/trainer_card/trainer_card.2bpp"

 GetPlayerBackpic:
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@ -1062,14 +1062,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

@ -1896,14 +1895,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]
@ -2353,7 +2352,6 @@ RestorePPEffect:
 	jr c, .do_ppup

 .CantUsePPUpOnSketch:
-.pp_is_maxed_out
 	ld hl, PPIsMaxedOutText
 	call PrintText
 	jr .loop2
@ -2650,16 +2648,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.
@ -2711,11 +2710,11 @@ ItemUsedText:
 	text_far _ItemUsedText
 	text_end

-ItemGotOnText:
+ItemGotOnText: ; unreferenced
 	text_far _ItemGotOnText
 	text_end

-ItemGotOffText:
+ItemGotOffText: ; unreferenced
 	text_far _ItemGotOffText
 	text_end

--- a/engine/items/items.asm
+++ b/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
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@ -1531,7 +1531,7 @@ PC_Mart_BallsPocketMenuHeader:
 	dba PlaceMenuItemQuantity
 	dba UpdateItemDescription

-PackNoItemText:
+PackNoItemText: ; unreferenced
 	text_far _PackNoItemText
 	text_end

@ -1571,7 +1571,7 @@ PackEmptyText:
 	text_far _PackEmptyText
 	text_end

-YouCantUseItInABattleText:
+YouCantUseItInABattleText: ; unreferenced
 	text_far _YouCantUseItInABattleText
 	text_end

--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@ -159,7 +159,7 @@ TeachTMHM:
 	and a
 	ret

-.unused
+.didnt_use ; unreferenced
 	ld a, 2
 	ld [wItemEffectSucceeded], a
 .learned_move
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@ -107,8 +107,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]
@ -162,7 +162,7 @@ Gen2ToGen1LinkComms:

 .done_party
 	ld [de], a
-	ld hl, wTimeCapsulePartyMon1Species
+	ld hl, wTimeCapsulePlayerData
 	call Function2868a
 	ld a, LOW(wOTPartyMonOT)
 	ld [wUnusedD102], a
@ -253,8 +253,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]
@ -584,7 +584,7 @@ FixDataForLinkTransfer:
 	ld [hli], a
 	dec b
 	jr nz, .loop3
-	ld hl, wTimeCapsulePartyMon1 - 1 + PARTY_LENGTH
+	ld hl, wTimeCapsulePlayerData - 1 + PARTY_LENGTH
 	ld de, wc612
 	lb bc, 0, 0
 .loop4
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@ -15,7 +15,7 @@ Function16d42e:
 	call CopyBytes
 	ret

-Function16d43b:
+Function16d43b: ; unreferenced
 	call LoadStandardMenuHeader
 	call ClearBGPalettes
 	call ClearTilemap
--- a/engine/link/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
@ -1148,7 +1148,7 @@ MysteryGift_CopyReceivedDecosToPC:
 .skip
 	inc c
 	ld a, c
-	cp TrophyIDs - DecorationIDs
+	cp NUM_NON_TROPHY_DECOS
 	jr c, .loop
 	jp CloseSRAM

--- a/engine/link/mystery_gift_2.asm
+++ b/engine/link/mystery_gift_2.asm
@ -2,23 +2,23 @@ PrepMysteryGiftDataToSend:
 	ld de, wMysteryGiftStaging
 	ld a, $1 + GS_VERSION
 	ld [de], a
-	inc de ; wc801
+	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 ; wc802
+	inc de ; wMysteryGiftStaging+2
 	ld a, [hl]
 	ld [de], a
 	ld c, a
-	inc de ; wc803
+	inc de ; wMysteryGiftStaging+3
 	push bc
 	ld hl, sPlayerData + wPlayerName - wPlayerData
 	ld bc, NAME_LENGTH
 	call CopyBytes
-	push de ; wc80e
+	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 ; wc80f
+	inc de ; wMysteryGiftStaging+15
 	call CloseSRAM
 	call Random
 	and 1
 	ld [de], a
-	inc de ; wc810
+	inc de ; wMysteryGiftStaging+16
 	call .RandomSample
 	ld [de], a
-	inc de ; wc811
+	inc de ; wMysteryGiftStaging+17
 	ld a, c
 	ld c, b
 	ld b, a
 	call .RandomSample
 	ld [de], a
-	inc de ; wc812
+	inc de ; wMysteryGiftStaging+18
 	ld a, BANK(sBackupMysteryGiftItem)
 	call OpenSRAM
 	ld a, [sBackupMysteryGiftItem]
--- a/engine/math/print_num.asm
+++ b/engine/math/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
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@ -316,20 +316,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

--- a/engine/menus/menu_2.asm
+++ b/engine/menus/menu_2.asm
@ -156,18 +156,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
@ -179,7 +179,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
@ -193,15 +193,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@"

 FindApricornsInBag:
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@ -275,6 +275,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
@ -880,7 +881,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:
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@ -199,7 +199,7 @@ Credits_RequestGFX:
 	xor a
 	ldh [hBGMapMode], a
 	ld a, 8
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 	jp Credits_Next

 Credits_LYOverride:
--- a/engine/movie/unused_title.asm
+++ b/engine/movie/unused_title.asm
@ -1,4 +1,4 @@
-UnusedTitleScreen:
+UnusedTitleScreen: ; unreferenced
 	call ClearBGPalettes
 	call ClearTilemap
 	call DisableLCD
@ -154,7 +154,7 @@ UnusedTitleFG_OAM:
 	dbsprite 13, 11,  0,  0, $4c, 1
 	dbsprite 14, 11,  0,  0, $4e, 1

-Function10ed51:
+Function10ed51: ; unreferenced
 	call _TitleScreen
 .loop
 	call JoyTextDelay
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@ -549,7 +549,7 @@ GetDecoName:
 	ld a, e
 	jr .getpokename

-.unused
+.unused ; unreferenced
 	push de
 	call .getdeconame
 	pop de
@ -939,7 +939,7 @@ GetDecorationID:
 	pop hl
 	ret

-SetAllDecorationFlags:
+SetAllDecorationFlags: ; unreferenced
 	ld hl, DecorationIDs
 .loop
 	ld a, [hli]
--- a/engine/overworld/events.asm
+++ b/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

@ -135,7 +135,7 @@ EnterMap:
 	ld [wMapStatus], a
 	ret

-UnusedWait30Frames:
+UnusedWait30Frames: ; unreferenced
 	ld c, 30
 	call DelayFrames
 	ret
@ -248,7 +248,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
@ -395,8 +395,8 @@ SetMinTwoStepWildEncounterCooldown:
 	ld [wWildEncounterCooldown], a
 	ret

-Dummy_CheckScriptFlags3Bit5:
-	call CheckBit5_ScriptFlags3
+Dummy_CheckScriptFlags2Bit5:
+	call CheckBit5_ScriptFlags2
 	ret z
 	call SetXYCompareFlags
 	ret
@ -480,8 +480,8 @@ CheckTimeEvents:
 	scf
 	ret

-.unused
-	ld a, 8
+.unused ; unreferenced
+	ld a, $8 ; ???
 	scf
 	ret

--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@ -2894,20 +2894,20 @@ InitSprites:
 	ldh [hCurSpriteTile], a
 	xor a
 	bit 7, [hl]
-	jr nz, .skip1
+	jr nz, .not_vram1
 	or VRAM_BANK_1
-.skip1
+.not_vram1
 	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
@ -2917,9 +2917,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_X
 	add hl, bc
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@ -2173,8 +2173,7 @@ Script_warpcheck:
 	farcall EnableEvents
 	ret

-Script_enableevents:
-; unused
+Script_enableevents: ; unreferenced
 	farcall EnableEvents
 	ret

--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@ -203,7 +203,7 @@ CheckPokerusTick::
 	xor a
 	ret

-SetUnusedTwoDayTimer:
+SetUnusedTwoDayTimer: ; unreferenced
 	ld a, 2
 	ld hl, wUnusedTwoDayTimer
 	ld [hl], a
@ -308,7 +308,7 @@ UpdateTimeRemaining:
 	scf
 	ret

-GetSecondsSinceIfLessThan60:
+GetSecondsSinceIfLessThan60: ; unreferenced
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@ -330,7 +330,7 @@ GetMinutesSinceIfLessThan60:
 	ld a, [wMinutesSince]
 	ret

-GetHoursSinceIfLessThan24:
+GetHoursSinceIfLessThan24: ; unreferenced
 	ld a, [wDaysSince]
 	and a
 	jr nz, GetTimeElapsed_ExceedsUnitLimit
@ -349,7 +349,7 @@ CalcDaysSince:
 	xor a
 	jr _CalcDaysSince

-CalcHoursDaysSince:
+CalcHoursDaysSince: ; unreferenced
 	inc hl
 	xor a
 	jr _CalcHoursDaysSince
@ -423,7 +423,7 @@ CopyDayToHL:
 	ld [hl], a
 	ret

-CopyDayHourToHL:
+CopyDayHourToHL: ; unreferenced
 	ld a, [wCurDay]
 	ld [hli], a
 	ldh a, [hHours]
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@ -437,7 +437,7 @@ Script_SpecialBillCall::
 	ld e, PHONE_BILL
 	jp LoadCallerScript

-LoadElmCallScript:
+Script_SpecialElmCall: ; unreferenced
 	callasm .LoadElmScript
 	pause 30
 	sjump Script_ReceivePhoneCall
@ -720,7 +720,7 @@ PhoneJustTalkToThemText:
 	text_far _PhoneJustTalkToThemText
 	text_end

-PhoneThankYouTextScript:
+PhoneThankYouTextScript: ; unreferenced
 	writetext PhoneThankYouText
 	end

--- a/engine/phone/scripts/elm.asm
+++ b/engine/phone/scripts/elm.asm
@ -95,7 +95,7 @@ ElmPhoneCallerScript:
 	specialphonecall SPECIALCALL_NONE
 	end

-.unused
+.neat ; unreferenced
 	farwritetext ElmPhoneGotAholdOfSomethingNeatText
 	specialphonecall SPECIALCALL_NONE
 	end
--- a/engine/phone/scripts/generic_callee.asm
+++ b/engine/phone/scripts/generic_callee.asm
@ -1103,7 +1103,7 @@ PhoneScript_Generic_Male:
 	promptbutton
 	end

-.Unknown:
+.Unknown: ; unreferenced
 	farwritetext UnknownGenericText
 	promptbutton
 	end
--- a/engine/phone/scripts/hangups_2.asm
+++ b/engine/phone/scripts/hangups_2.asm
@ -3,7 +3,7 @@ BeverlyComePickUpScript:
 	promptbutton
 	sjump PhoneScript_HangUpText_Female

-JoseComePickUpScript:
+JoseComePickUpScript: ; unreferenced
 	farwritetext JoseComePickUpText
 	promptbutton
 	sjump PhoneScript_HangUpText_Male
--- a/engine/pokedex/pokedex.asm
+++ b/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  ?'??"
@ -2480,6 +2480,7 @@ Pokedex_LoadUnownFont:
 	ld a, BANK(sScratch)
 	call OpenSRAM
 	ld hl, UnownFont
+	; sScratch + $188 was the address of sDecompressBuffer in pokegold
 	ld de, sScratch + $188
 	ld bc, 39 tiles
 	ld a, BANK(UnownFont)
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@ -1546,7 +1546,7 @@ RadioChannels:
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
-.kanto
+; kanto
 	and a
 	ret

@ -2265,7 +2265,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
@ -2569,7 +2569,7 @@ Pokedex_GetArea:
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
-.kanto
+; kanto
 	ld a, [wTownMapCursorLandmark]
 	and a
 	jr z, .clear
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@ -141,7 +141,7 @@ PrintRadioLine:
 	ld [wRadioTextDelay], a
 	ret

-ReplacePeriodsWithSpaces:
+ReplacePeriodsWithSpaces: ; unreferenced
 	push hl
 	ld b, SCREEN_WIDTH * 2
 .loop
@ -149,7 +149,6 @@ ReplacePeriodsWithSpaces:
 	cp "."
 	jr nz, .next
 	ld [hl], " "
-
 .next
 	inc hl
 	dec b
@ -1779,7 +1778,7 @@ CopyRadioTextToRAM:
 	cp TX_FAR
 	jp z, FarCopyRadioText
 	ld de, wRadioText
-	ld bc, SCREEN_WIDTH * 2
+	ld bc, 2 * SCREEN_WIDTH
 	jp CopyBytes

 StartRadioStation:
--- a/engine/pokemon/bills_pc.asm
+++ b/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
@ -358,7 +358,7 @@ _WithdrawPKMN:
 	ld [wJumptableIndex], a
 	ret

-.unused
+.go_back ; unreferenced
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
@ -609,7 +609,7 @@ _MovePKMNWithoutMail:
 	ld [wJumptableIndex], a
 	ret

-.unused
+.go_back ; unreferenced
 	ld hl, wJumptableIndex
 	dec [hl]
 	ret
@ -2222,7 +2222,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!@"
@ -2268,16 +2268,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
@ -2286,7 +2286,7 @@ x = x + 1
 endr
 	db -1

-.boxnames
+.PrintBoxNames:
 	push de
 	ld a, [wMenuSelection]
 	dec a
--- a/engine/pokemon/breedmon_level_growth.asm
+++ b/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
--- a/engine/pokemon/mail.asm
+++ b/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

--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@ -404,7 +404,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
@ -767,7 +767,7 @@ Mail_Place14TileAlternatingRow:
 	ld b, 14 / 2
 	jr Mail_PlaceAlternatingRow

-Mail_Place16TileAlternatingRow:
+Mail_Place16TileAlternatingRow: ; unreferenced
 	push af
 	ld b, 16 / 2
 	jr Mail_PlaceAlternatingRow
@ -775,6 +775,7 @@ Mail_Place16TileAlternatingRow:
 Mail_Place18TileAlternatingRow:
 	push af
 	ld b, 18 / 2
+	; fallthrough

 Mail_PlaceAlternatingRow:
 .loop
@ -812,16 +813,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:
@ -830,6 +831,7 @@ Mail_DrawTopBottomBorder:

 Mail_DrawFullWidthBorder:
 	ld b, SCREEN_WIDTH
+	; fallthrough

 Mail_DrawRowLoop:
 .loop
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@ -758,12 +758,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:
--- a/engine/printer/printer_serial.asm
+++ b/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

--- a/engine/smallflag.asm
+++ b/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]
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@ -305,7 +305,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
@ -891,7 +891,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
--- a/gfx/font.asm
+++ b/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:
@ -49,7 +49,7 @@ INCBIN "gfx/font/space.2bpp"
 FontsExtra_SolidBlackGFX:
 INCBIN "gfx/font/black.1bpp"

-UnusedUpArrowGFX:
+UnusedUpArrowGFX: ; unreferenced
 INCBIN "gfx/font/unused_up_arrow.1bpp"

 MobilePhoneTilesGFX:
--- a/gfx/mail.asm
+++ b/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"

--- a/gfx/mail/sentret.png
+++ b/gfx/mail/sentret.png
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@ -90,7 +90,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:
--- a/home/audio.asm
+++ b/home/audio.asm
@ -436,7 +436,7 @@ SpecialMapMusic::
 	and a
 	ret

-.bike
+.bike ; unreferenced
 	ld de, MUSIC_BICYCLE
 	scf
 	ret
--- a/home/battle.asm
+++ b/home/battle.asm
@ -275,6 +275,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
--- a/home/decompress.asm
+++ b/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
--- a/home/gfx.asm
+++ b/home/gfx.asm
@ -111,7 +111,7 @@ LoadFontsExtra::
 	farcall _LoadFontsExtra2
 	ret

-LoadFontsExtra2:
+LoadFontsExtra2: ; unreferenced
 	farcall _LoadFontsExtra2
 	ret

@ -226,10 +226,10 @@ Request2bpp::
 	cp [hl]
 	jr nc, .cycle

-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a
 .wait
 	call DelayFrame
-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	and a
 	jr nz, .wait

@ -245,11 +245,11 @@ Request2bpp::

 .cycle
 	ldh a, [hTilesPerCycle]
-	ld [wRequested2bpp], a
+	ld [wRequested2bppSize], a

 .wait2
 	call DelayFrame
-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	and a
 	jr nz, .wait2

@ -300,10 +300,10 @@ Request1bpp::
 	cp [hl]
 	jr nc, .cycle

-	ld [wRequested1bpp], a
+	ld [wRequested1bppSize], a
 .wait
 	call DelayFrame
-	ld a, [wRequested1bpp]
+	ld a, [wRequested1bppSize]
 	and a
 	jr nz, .wait

@ -319,11 +319,11 @@ Request1bpp::

 .cycle
 	ldh a, [hTilesPerCycle]
-	ld [wRequested1bpp], a
+	ld [wRequested1bppSize], a

 .wait2
 	call DelayFrame
-	ld a, [wRequested1bpp]
+	ld a, [wRequested1bppSize]
 	and a
 	jr nz, .wait2

--- a/home/print_bcd.asm
+++ b/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
--- a/home/serial.asm
+++ b/home/serial.asm
@ -278,7 +278,7 @@ Serial_PrintWaitingTextAndSyncAndExchangeNybble::
 	call WaitLinkTransfer
 	jp SafeLoadTempTilemapToTilemap

-Serial_SyncAndExchangeNybble::
+Serial_SyncAndExchangeNybble:: ; unreferenced
 	call LoadTilemapToTempTilemap
 	callfar PlaceWaitingText
 	jp WaitLinkTransfer
--- a/home/text.asm
+++ b/home/text.asm
@ -242,7 +242,7 @@ ENDM
 	dict "ﾞ",         .place ; should be .diacritic
 	jr .not_diacritic

-.diacritic
+.diacritic ; unreferenced
 	ld b, a
 	call Diacritic
 	jp NextChar
@ -250,18 +250,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
@ -269,11 +270,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

--- a/home/video.asm
+++ b/home/video.asm
@ -184,7 +184,7 @@ UpdateBGMap::

 THIRD_HEIGHT EQU SCREEN_HEIGHT / 3

-.bottom
+; bottom
 	ld de, 2 * THIRD_HEIGHT * SCREEN_WIDTH
 	add hl, de
 	ld sp, hl
@ -267,7 +267,7 @@ endr
 Serve1bppRequest::
 ; Only call during the first fifth of VBlank

-	ld a, [wRequested1bpp]
+	ld a, [wRequested1bppSize]
 	and a
 	ret z

@ -278,7 +278,7 @@ Serve1bppRequest::
 	cp LY_VBLANK + 2
 	ret nc

-; Copy [wRequested1bpp] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest]
+; Copy [wRequested1bppSize] 1bpp tiles from [wRequested1bppSource] to [wRequested1bppDest]

 	ld [hSPBuffer], sp

@ -296,11 +296,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

@ -345,7 +345,7 @@ endr
 Serve2bppRequest::
 ; Only call during the first fifth of VBlank

-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	and a
 	ret z

@ -358,12 +358,12 @@ Serve2bppRequest::
 	jr _Serve2bppRequest

 Serve2bppRequest_VBlank::
-	ld a, [wRequested2bpp]
+	ld a, [wRequested2bppSize]
 	and a
 	ret z

 _Serve2bppRequest::
-; Copy [wRequested2bpp] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]
+; Copy [wRequested2bppSize] 2bpp tiles from [wRequested2bppSource] to [wRequested2bppDest]

 	ld [hSPBuffer], sp

@ -381,11 +381,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

--- a/maps/AzaleaPokecenter1F.asm
+++ b/maps/AzaleaPokecenter1F.asm
@ -36,8 +36,7 @@ AzaleaPokecenter1FGentlemanText:
 	line "fainted."
 	done

-AzaleaPokecenter1FUnusedText:
-; unreferenced
+AzaleaPokecenter1FUnusedText: ; unreferenced
 	text "This BILL guy"
 	line "created the system"

--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@ -143,8 +143,7 @@ AzaleaTownSlowpokeScript:
 	closetext
 	end

-UnusedWoosterScript:
-; unused
+UnusedWoosterScript: ; unreferenced
 	faceplayer
 	opentext
 	writetext WoosterText
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@ -364,7 +364,7 @@ Text_RightThisWayToYourBattleRoom:
 	line "your BATTLE ROOM."
 	done

-Text_BattleTowerIntroduction_1:
+Text_BattleTowerIntroduction_1: ; unreferenced
 	text "BATTLE TOWER is a"
 	line "facility made for"
 	cont "#MON battles."
@ -473,7 +473,7 @@ Text_PleaseConfirmOnThisMonitor:
 	line "this monitor."
 	done

-Text_ThankYou:
+Text_ThankYou: ; unreferenced
 	text "Thank you!"

 	para ""
@ -484,7 +484,7 @@ Text_ThanksForVisiting:
 	line "visiting!"
 	done

-Text_BeatenAllTheTrainers_Mobile:
+Text_BeatenAllTheTrainers_Mobile: ; unreferenced
 	text "Congratulations!"

 	para "You've beaten all"
@ -514,7 +514,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers:
 	para ""
 	done

-Text_AskRegisterRecord_Mobile:
+Text_AskRegisterRecord_Mobile: ; unreferenced
 	text "Would you like to"
 	line "register your"

@ -539,7 +539,7 @@ Text_YourPackIsStuffedFull:
 	line "and come back."
 	done

-Text_YourRegistrationIsComplete:
+Text_YourRegistrationIsComplete: ; unreferenced
 	text "Your registration"
 	line "is complete."

@ -582,7 +582,7 @@ Text_CantBeRegistered_PreviousRecordDeleted:
 	cont "deleted. OK?"
 	done

-Text_CheckTheLeaderHonorRoll:
+Text_CheckTheLeaderHonorRoll: ; unreferenced
 	text "Check the LEADER"
 	line "HONOR ROLL?"
 	done
@ -639,7 +639,7 @@ Text_NextUpOpponentNo:
 	text ". Ready?"
 	done

-Text_SaveBeforeConnecting_Mobile:
+Text_SaveBeforeConnecting_Mobile: ; unreferenced
 	text "Your session will"
 	line "be SAVED before"

@ -673,7 +673,7 @@ Text_CancelYourBattleRoomChallenge:
 	line "ROOM challenge?"
 	done

-Text_RegisterRecordOnFile_Mobile:
+Text_RegisterRecordOnFile_Mobile: ; unreferenced
 	text "We have your"
 	line "previous record on"

@ -714,8 +714,8 @@ Text_TooMuchTimeElapsedNoRegister:
 	cont "challenge."
 	done

-; a dupe?
-Text_RegisterRecordTimedOut_Mobile:
+Text_RegisterRecordTimedOut_Mobile: ; unreferenced
+; duplicate of Text_TooMuchTimeElapsedNoRegister
 	text "Sorry, but it's"
 	line "not possible to"

--- a/Show More
+++ b/Show More