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

Remove skip prefix from AI move scores #1163

Merged
merged 4 commits into from
Dec 29, 2024
Merged

Remove skip prefix from AI move scores #1163

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c160ec6
asm: better describe discouragement
jordanmoore753 Dec 28, 2024
247cd0a
asm: remove skip on rage encourage
jordanmoore753 Dec 28, 2024
4548280
asm: remove skip from mimic routine
jordanmoore753 Dec 28, 2024
5d2617a
asm: Restore comment 'again'
jordanmoore753 Dec 29, 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
14 changes: 7 additions & 7 deletions engine/battle/ai/scoring.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,10 +1094,10 @@ AI_Smart_Confuse:
ret c
call Random
cp 10 percent
jr c, .skipdiscourage
jr c, .discourage
inc [hl]

.skipdiscourage
.discourage
; Discourage again if player's HP is below 25%.
call AICheckPlayerQuarterHP
ret c
Expand Down Expand Up @@ -1248,12 +1248,12 @@ AI_Smart_Rage:

; If enemy's Rage is building, 50% chance to encourage this move.
call AI_50_50
jr c, .skipencourage
jr c, .encourage

dec [hl]

; Encourage this move based on Rage's counter.
.skipencourage
.encourage
ld a, [wEnemyRageCounter]
cp 2
ret c
Expand Down Expand Up @@ -1300,14 +1300,14 @@ AI_Smart_Mimic:
cp EFFECTIVE
pop hl
jr c, .discourage
jr z, .skip_encourage
jr z, .encourage

call AI_50_50
jr c, .skip_encourage
jr c, .encourage

dec [hl]

.skip_encourage
.encourage
ld a, [wLastPlayerCounterMove]
push hl
ld hl, UsefulMoves
Expand Down
Loading