summaryrefslogtreecommitdiff
path: root/event
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 16:18:05 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 16:18:05 -0500
commit85aa236c34e50da698d4eeacd5c76a05463c83b2 (patch)
tree0cdde11bab7b4610df5ec8bb2925aa00d3951ac0 /event
parent2e200ce85e21eee3d46a4c82074425697c0b433d (diff)
Use percentages for AI scoring logic
Define MAX_DAY_CARE_EXP
Diffstat (limited to 'event')
-rwxr-xr-xevent/happiness_egg.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/event/happiness_egg.asm b/event/happiness_egg.asm
index 1bd5b05f3..a1ade1364 100755
--- a/event/happiness_egg.asm
+++ b/event/happiness_egg.asm
@@ -159,9 +159,9 @@ DayCareStep:: ; 7282
dec hl
inc [hl]
ld a, [hl]
- cp HIGH($500000 >> 8)
+ cp HIGH(MAX_DAY_CARE_EXP >> 8)
jr c, .day_care_lady
- ld a, HIGH($500000 >> 8)
+ ld a, HIGH(MAX_DAY_CARE_EXP >> 8)
ld [hl], a
.day_care_lady
@@ -181,9 +181,9 @@ DayCareStep:: ; 7282
dec hl
inc [hl]
ld a, [hl]
- cp HIGH($500000 >> 8)
+ cp HIGH(MAX_DAY_CARE_EXP >> 8)
jr c, .check_egg
- ld a, HIGH($500000 >> 8)
+ ld a, HIGH(MAX_DAY_CARE_EXP >> 8)
ld [hl], a
.check_egg
@@ -199,7 +199,7 @@ DayCareStep:: ; 7282
callfar CheckBreedmonCompatibility
ld a, [wd265]
cp 230
- ld b, -1 + 32 percent
+ ld b, 32 percent - 1
jr nc, .okay
ld a, [wd265]
cp 170