diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm
index c00e0b60aa5..49ac00e951f 100644
--- a/data/battle/ai/rain_dance_moves.asm
+++ b/data/battle/ai/rain_dance_moves.asm
@@ -1,4 +1,4 @@
-; AI_SMART prefers these moves during rain.
+; AI_SMART encourages Rain Dance if it also knows these moves.
 
 RainDanceMoves:
 	db WATER_GUN
diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm
index 65838e0f0f8..22ba251466b 100644
--- a/data/battle/ai/stall_moves.asm
+++ b/data/battle/ai/stall_moves.asm
@@ -1,5 +1,5 @@
 ; AI_OPPORTUNIST discourages these moves
-; when the player's HP is low.
+; when its HP is low.
 
 StallMoves:
 	db SWORDS_DANCE
diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm
index 3f974b54568..d012ed872e1 100644
--- a/data/battle/ai/sunny_day_moves.asm
+++ b/data/battle/ai/sunny_day_moves.asm
@@ -1,7 +1,7 @@
-; AI_SMART prefers these moves during harsh sunlight.
+; AI_SMART encourages Sunny Day if it also knows these moves.
 
 SunnyDayMoves:
-; BUG: "Smart" AI does not encourage Solar Beam, Flame Wheel, or Moonlight during Sunny Day (see docs/bugs_and_glitches.md)
+; BUG: "Smart" AI does not encourage Sunny Day when it knows Solar Beam, Flame Wheel, or Moonlight (see docs/bugs_and_glitches.md)
 	db FIRE_PUNCH
 	db EMBER
 	db FLAMETHROWER
diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm
index 456bda2da69..0398e627308 100644
--- a/data/battle/ai/useful_moves.asm
+++ b/data/battle/ai/useful_moves.asm
@@ -1,4 +1,5 @@
-; AI_SMART knows these moves are usable all-around.
+; AI_SMART tries to use Mirror Move, Mimic, and Disable
+; after the player uses these moves.
 
 UsefulMoves:
 	db DOUBLE_EDGE
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 998801713a2..46951d8523d 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1267,13 +1267,13 @@ Pryce's dialog ("That BADGE will raise the SPECIAL stats of POKéMON.") implies
 ```
 
 
-### "Smart" AI does not encourage Solar Beam, Flame Wheel, or Moonlight during Sunny Day
+### "Smart" AI does not encourage Sunny Day when it knows Solar Beam, Flame Wheel, or Moonlight
 
 **Fix:** Edit `SunnyDayMoves` in [data/battle/ai/sunny_day_moves.asm](https://github.com/pret/pokecrystal/blob/master/data/battle/ai/sunny_day_moves.asm):
 
 ```diff
  SunnyDayMoves:
--; BUG: "Smart" AI does not encourage Solar Beam, Flame Wheel, or Moonlight during Sunny Day (see docs/bugs_and_glitches.md)
+-; BUG: "Smart" AI does not encourage Sunny Day when it knows Solar Beam, Flame Wheel, or Moonlight (see docs/bugs_and_glitches.md)
  	db FIRE_PUNCH
  	db EMBER
  	db FLAMETHROWER
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 99cace69364..5b2308089e5 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -54,7 +54,7 @@ AI_Basic:
 	and a
 	jr nz, .discourage
 
-; Dismiss Safeguard if it's already active.
+; Dismiss status moves if the player is Safeguarded.
 	ld a, [wPlayerScreens]
 	bit SCREENS_SAFEGUARD, a
 	jr z, .checkmove