diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-13 14:50:56 -0800 |
| commit | b65c6e815643a1cbce8c7c3cd48fc9881bb56d01 (patch) | |
| tree | 151a1d0eda1b28d497f4ee8340141bd6f94c1fef /engine/experience.asm | |
| parent | b35294752c55b5df88ccfc785279c36f30a43fd6 (diff) | |
| parent | 7b7c563c93155e121e05149779cfb78b0bf9d259 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'engine/experience.asm')
| -rwxr-xr-x | engine/experience.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/experience.asm b/engine/experience.asm index 91f1dd5d..68d22843 100755 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -1,6 +1,6 @@ ; calculates the level a mon should be based on its current exp CalcLevelFromExperience: ; 58f43 (16:4f43) - ld a, [wcf98] + ld a, [wLoadedMonSpecies] ld [wd0b5], a call GetMonHeader ld d, $1 ; init level to 1 @@ -8,7 +8,7 @@ CalcLevelFromExperience: ; 58f43 (16:4f43) inc d ; increment level call CalcExperience push hl - ld hl, wcfa8 ; current exp + ld hl, wLoadedMonExp + 2 ; current exp ; compare exp needed for level d with current exp ld a, [H_MULTIPLICAND + 2] ld c, a |