From 83e31d7c07ea9ead2a3f12230eef64f8173d9f7c Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Fri, 14 Mar 2025 23:13:09 -0400 Subject: [PATCH] Correct wrong and misleading comments about enemy trainer AI --- data/battle/ai/rain_dance_moves.asm | 2 +- data/battle/ai/stall_moves.asm | 2 +- data/battle/ai/sunny_day_moves.asm | 4 ++-- data/battle/ai/useful_moves.asm | 3 ++- engine/battle/ai/scoring.asm | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm index c00e0b60..49ac00e9 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 65838e0f..22ba2514 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 3f974b54..d012ed87 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 456bda2d..0398e627 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/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index 394c23af..47d00f76 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