Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct wrong and misleading comments about enemy trainer AI #1149

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Correct wrong and misleading comments about enemy trainer AI #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7fec64d
Update scoring.asm
hannabartpekopon Nov 11, 2024
bdbb69d
Update rain_dance_moves.asm (#1)
hannabartpekopon Nov 11, 2024
25bc032
Update sunny_day_moves.asm (#2)
hannabartpekopon Nov 12, 2024
46ec362
Update stall_moves.asm (#3)
hannabartpekopon Nov 12, 2024
ad9b268
Update useful_moves.asm (#4)
hannabartpekopon Nov 12, 2024
4b7456d
Update bugs_and_glitches.md (#5)
hannabartpekopon Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/battle/ai/rain_dance_moves.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/battle/ai/stall_moves.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; AI_OPPORTUNIST discourages these moves
; when the player's HP is low.
; when the enemy's HP is low.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
; when the enemy's HP is low.
; when its HP is low.


StallMoves:
db SWORDS_DANCE
Expand Down
4 changes: 2 additions & 2 deletions data/battle/ai/sunny_day_moves.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
; BUG: Solar Beam, Flame Wheel, and Moonlight should be on this list (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
Expand Down
2 changes: 1 addition & 1 deletion data/battle/ai/useful_moves.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
; AI_SMART tries to use Mirror Move, Mimic, and Disable on these moves.
; AI_SMART tries to use Mirror Move, Mimic, and Disable
; after the player uses these moves.


UsefulMoves:
db DOUBLE_EDGE
Expand Down
4 changes: 2 additions & 2 deletions docs/bugs_and_glitches.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
### "Smart" AI does not encourage Sunny Day if it knows Solar Beam, Flame Wheel, or Moonlight
### "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: Solar Beam, Flame Wheel, and Moonlight should be on this list (see docs/bugs_and_glitches.md)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
-; BUG: Solar Beam, Flame Wheel, and Moonlight should be on this list (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
Expand Down
2 changes: 1 addition & 1 deletion engine/battle/ai/scoring.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down