diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/experience.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
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 |