diff options
| author | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2018-02-03 22:18:56 -0500 |
| commit | e668b6cf3a7760303edd181baa69901a94a7d653 (patch) | |
| tree | b9de2e272aceb5ca4d24830a64ee4fd87e9fb40e /engine/experience.asm | |
| parent | 2edf131b056c6d2b1ec9eb48b97fba31b0f953c7 (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/experience.asm')
| -rw-r--r-- | engine/experience.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/experience.asm b/engine/experience.asm index b1e1fb831..6b94ed357 100644 --- a/engine/experience.asm +++ b/engine/experience.asm @@ -1,6 +1,6 @@ CalcLevel: ; 50e1b - ld a, [TempMonSpecies] - ld [CurSpecies], a + ld a, [wTempMonSpecies] + ld [wCurSpecies], a call GetBaseData ld d, 1 .next_level @@ -10,7 +10,7 @@ CalcLevel: ; 50e1b jr z, .got_level call CalcExpAtLevel push hl - ld hl, TempMonExp + 2 + ld hl, wTempMonExp + 2 ld a, [hProduct + 3] ld c, a ld a, [hld] @@ -32,7 +32,7 @@ CalcLevel: ; 50e1b CalcExpAtLevel: ; 50e47 ; (a/b)*n**3 + c*n**2 + d*n - e - ld a, [BaseGrowthRate] + ld a, [wBaseGrowthRate] add a add a ld c, a |