From 7fec64d9ecbd058cdd7ef522d4dd45d360557af8 Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:37:50 -0800 Subject: [PATCH 1/6] Update scoring.asm Fix inaccurate comment. --- engine/battle/ai/scoring.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From bdbb69d6c9bc21623d13de7b37d8472573d7fb23 Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:57:37 -0800 Subject: [PATCH 2/6] Update rain_dance_moves.asm (#1) Rephrase misleading comment about AI use of Rain Dance moves. --- data/battle/ai/rain_dance_moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 25bc032b3f82b0d9a37a7ace5a51bb800f55c4e6 Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:01:09 -0800 Subject: [PATCH 3/6] Update sunny_day_moves.asm (#2) Rephrase misleading comments about AI use of Sunny Day moves. --- data/battle/ai/sunny_day_moves.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm index 3f974b54568..dcbe07d534b 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: Solar Beam, Flame Wheel, and Moonlight should be on this list (see docs/bugs_and_glitches.md) db FIRE_PUNCH db EMBER db FLAMETHROWER From 46ec362b961359fb22c412f8d0cdceb0e000a2d3 Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:03:00 -0800 Subject: [PATCH 4/6] Update stall_moves.asm (#3) AI_OPPORTUNIST checks enemy HP, not player. --- data/battle/ai/stall_moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm index 65838e0f0f8..ab70cbdfdc7 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 the enemy's HP is low. StallMoves: db SWORDS_DANCE From ad9b26899afa1a2f472293e4371e7d231065c1fa Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:04:12 -0800 Subject: [PATCH 5/6] Update useful_moves.asm (#4) Elaborate on AI use of "useful moves" in code comment. --- data/battle/ai/useful_moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm index 456bda2da69..26c19073792 100644 --- a/data/battle/ai/useful_moves.asm +++ b/data/battle/ai/useful_moves.asm @@ -1,4 +1,4 @@ -; AI_SMART knows these moves are usable all-around. +; AI_SMART tries to use Mirror Move, Mimic, and Disable on these moves. UsefulMoves: db DOUBLE_EDGE From 4b7456d1365997dbf0f733dcf3f8e2ea208a37af Mon Sep 17 00:00:00 2001 From: Hannabart Pekopon <105348498+hannabartpekopon@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:18:24 -0800 Subject: [PATCH 6/6] Update bugs_and_glitches.md (#5) Sync bug doc with Sunny Day moves list change. --- docs/bugs_and_glitches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 3ff088b30b1..93bf610e759 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 if 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: Solar Beam, Flame Wheel, and Moonlight should be on this list (see docs/bugs_and_glitches.md) db FIRE_PUNCH db EMBER db FLAMETHROWER