Comment, remove, or revise many unreferenced labels

9 files changed, 14 insertions, 15 deletions

diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index 2edf2def..4648e9d2 100644
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -160,7 +160,7 @@ DayCareAskDepositPokemon:
 	scf
 	ret
 
-.DaycareDummyText:
+.DaycareDummyText: ; unreferenced
 	text_far _DaycareDummyText
 	text_end
 
diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm
index aebbacdc..13f9a9a8 100644
--- 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
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 7cf2f03a..ae2daa86 100644
--- 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
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index b6b6e995..13b080aa 100644
--- a/engine/events/magnet_train.asm
+++ b/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
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 7aaaca90..1f82b3a9 100644
--- a/engine/events/overworld.asm
+++ b/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
 
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index e6de6f19..827f6941 100644
--- 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
diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm
index aaeeec76..9c4d1d85 100644
--- 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
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index 3cedbf17..06fb7b20 100644
--- a/engine/events/specials.asm
+++ b/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
diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
index c96df83a..42d89d1f 100644
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@@ -208,7 +208,7 @@ GetTreeScore:
 	cp 5
 	jr c, .good
 
-.bad
+; bad
 	xor a ; TREEMON_SCORE_BAD
 	ret