diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
| commit | 13e28b0ece7c7888cba792cc6f7219b384213427 (patch) | |
| tree | 4dcd58e0fe7ac33bf38817f423754dc758cb902f /engine/battle/experience.asm | |
| parent | Merge branch 'master' of https://github.com/YamaArashi/pokered (diff) | |
| parent | constants for flag actions (diff) | |
| download | pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.gz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.tar.xz pokeyellow-13e28b0ece7c7888cba792cc6f7219b384213427.zip | |
Merge pull request #106 from YamaArashi/master
jpab/jpba macros
Diffstat (limited to 'engine/battle/experience.asm')
| -rw-r--r-- | engine/battle/experience.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 6ec8c463..6f479ea3 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -15,7 +15,7 @@ GainExperience: ; 5524f (15:524f) ld hl, wPartyGainExpFlags ld a, [wWhichPokemon] ld c, a - ld b, $2 + ld b, FLAG_TEST predef FlagActionPredef ld a, c and a ; is mon's gain exp flag set? @@ -257,7 +257,7 @@ GainExperience: ; 5524f (15:524f) ld hl, wCanEvolveFlags ld a, [wWhichPokemon] ld c, a - ld b, $1 + ld b, FLAG_SET predef FlagActionPredef pop hl pop af @@ -281,7 +281,7 @@ GainExperience: ; 5524f (15:524f) ld [hl], a ; clear gain exp flags ld a, [wPlayerMonNumber] ld c, a - ld b, $1 + ld b, FLAG_SET push bc predef FlagActionPredef ; set the gain exp flag for the mon that is currently out ld hl, wPartyFoughtCurrentEnemyFlags |