diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/load_mon_data.asm | |
parent | e181c27c5e396aea254b471b182df3237eeb03ce (diff) | |
parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/load_mon_data.asm')
-rw-r--r-- | engine/load_mon_data.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/load_mon_data.asm b/engine/load_mon_data.asm index 41ba65b1..4a1e3097 100644 --- a/engine/load_mon_data.asm +++ b/engine/load_mon_data.asm @@ -16,7 +16,7 @@ LoadMonData_: ; 442b (1:442b) ld a, [wWhichPokemon] ld e, a call GetMonSpecies - + .GetMonHeader ld a, [wcf91] ld [wd0b5], a ; input for GetMonHeader @@ -47,7 +47,7 @@ LoadMonData_: ; 442b (1:442b) ld de, wLoadedMon ld bc, wPartyMon2 - wPartyMon1 jp CopyData - + ; get species of mon e in list [wMonDataLocation] for LoadMonData GetMonSpecies: ; 4478 (1:4478) ld hl, wPartySpecies |