diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-16 13:42:17 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-16 13:42:17 -0400 |
| commit | 60b09f291d22f72838e29c91cd62ff0d041e2332 (patch) | |
| tree | b578baa0ab406855304ce3a8a6a2bd737fbc1fc4 /engine/pokemon/move_mon.asm | |
| parent | 03cb8c53f1507091f09a17235416904d5ed29a49 (diff) | |
| parent | 15648960606da9b1e64c2171c5398d6a5f734b4f (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/pokemon/move_mon.asm')
| -rw-r--r-- | engine/pokemon/move_mon.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 6e9d90d36..c67d210b9 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1194,8 +1194,8 @@ GiveEgg:: ld hl, wPartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld a, [wMonStatusFlags] - bit 1, a + ld a, [wDebugFlags] + bit DEBUG_FIELD_F, a ld a, 1 jr nz, .got_init_happiness ld a, [wBaseEggSteps] |