diff options
| author | yenatch <yenatch@gmail.com> | 2014-05-23 15:20:53 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-05-23 15:20:53 -0700 |
| commit | 61dbfa440bd83b8bb490ec7e1c44ea6f0aed66df (patch) | |
| tree | c6b4ef2087b24e6e176477b0456f63e9c24b432c | |
| parent | Comment some bank 0 functions, and add wram labels for Predef. (diff) | |
| download | pokeyellow-61dbfa440bd83b8bb490ec7e1c44ea6f0aed66df.tar.gz pokeyellow-61dbfa440bd83b8bb490ec7e1c44ea6f0aed66df.tar.xz pokeyellow-61dbfa440bd83b8bb490ec7e1c44ea6f0aed66df.zip | |
Use a dedicated label for base stats.
The existing {Bulbasaur,Ivysaur,...}BaseStats labels are for convenience.
| -rwxr-xr-x | engine/evos_moves.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index a709f438..eb59ce39 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -156,7 +156,7 @@ Func_3ad71: ; 3ad71 (e:6d71) call Predef ; indirect jump to IndexToPokedex (41010 (10:5010)) ld a, [$d11e] dec a - ld hl, BulbasaurBaseStats ; $43de + ld hl, BaseStats ld bc, $1c call AddNTimes ld de, W_MONHEADER @@ -3028,7 +3028,7 @@ Func_152e:: ; 152e (0:152e) GetMonHeader:: ; 1537 (0:1537) ld a,[H_LOADEDROMBANK] push af - ld a,BANK(BulbasaurBaseStats) + ld a,BANK(BaseStats) ld [H_LOADEDROMBANK],a ld [$2000],a push bc @@ -3056,7 +3056,7 @@ GetMonHeader:: ; 1537 (0:1537) ld a,[$d11e] dec a ld bc,28 - ld hl,BulbasaurBaseStats + ld hl,BaseStats call AddNTimes ld de,W_MONHEADER ld bc,28 @@ -17121,6 +17121,7 @@ SECTION "bankE",ROMX,BANK[$E] INCLUDE "data/moves.asm" +BaseStats: INCLUDE "data/base_stats.asm" INCLUDE "data/cries.asm" |