diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm
index bcf0583f9..9286383b7 100644
--- a/engine/events/battle_tower/load_trainer.asm
+++ b/engine/events/battle_tower/load_trainer.asm
@@ -30,8 +30,8 @@ if DEF(_CRYSTAL11)
 	maskbits BATTLETOWER_NUM_UNIQUE_TRAINERS
 	cp BATTLETOWER_NUM_UNIQUE_TRAINERS
 else
-; Crystal 1.0 used the wrong constant here, so only the first 21
-; trainers in BattleTowerTrainers can be sampled.
+; BUG: Crystal 1.0 used the wrong constant here, so only the first
+; 21 trainers in BattleTowerTrainers can be sampled.
 	maskbits BATTLETOWER_NUM_UNIQUE_MON
 	cp BATTLETOWER_NUM_UNIQUE_MON
 endc
diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm
index 6ff9c5b3e..b5a3f5cb2 100644
--- a/engine/events/battle_tower/trainer_text.asm
+++ b/engine/events/battle_tower/trainer_text.asm
@@ -10,10 +10,9 @@ BattleTowerText::
 if DEF(_CRYSTAL11)
 	ld hl, wBT_OTTrainerClass
 else
-; BUG ALERT
-; Instead of loading the Trainer Class, this routine
-; loads the 6th character in the Trainer's name, then
-; uses it to get the gender of the trainer.
+; BUG: Instead of loading the trainer class,
+; Crystal 1.0 loads the 6th character in the trainer's
+; name, then uses it to get the trainer's gender.
 ; As a consequence, the enemy trainer's dialog will
 ; always be sampled from the female array.
 	ld hl, wBT_OTName + NAME_LENGTH_JAPANESE - 1
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index f5a8707e1..386c8e940 100644
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -867,8 +867,8 @@ INCBIN "gfx/mobile/stadium2_n64.2bpp"
 
 Stadium2N64Tilemap:
 if DEF(_CRYSTAL11)
-; Crystal 1.1 corrupted this tilemap by treating $0a bytes as Unix newlines,
-; and converting them to $0d $0a Windows newlines.
+; BUG: Crystal 1.1 corrupted this tilemap by treating $0a bytes as
+; Unix newlines, and converting them to $0d $0a Windows newlines.
 INCBIN "gfx/mobile/stadium2_n64_corrupt.tilemap"
 else
 INCBIN "gfx/mobile/stadium2_n64.tilemap"
diff --git a/ram/wram.asm b/ram/wram.asm
index be841992b..b0f39ecc7 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -743,7 +743,8 @@ if DEF(_CRYSTAL11)
 wPokedexStatus:: db
 wPokedexDataEnd::
 else
-wPokedexDataEnd:: ds 1
+wPokedexDataEnd::
+	ds 1
 endc
 	ds 2
 
@@ -1538,8 +1539,10 @@ wPrevDexEntryJumptableIndex:: db
 if DEF(_CRYSTAL11)
 wPrevDexEntryBackup:: db
 else
-wPrevDexEntryBackup::
-wPokedexStatus:: db
+; BUG: Crystal 1.0 reused the same byte in WRAM for
+; wPokedexStatus and wPrevDexEntryBackup.
+wPokedexStatus::
+wPrevDexEntryBackup:: db
 endc
 wUnusedPokedexByte:: db