diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-14 04:12:40 -0700 |
| commit | 53ae0e93fad9f4c3eaef92f102b1eeb531e59d68 (patch) | |
| tree | cfc859d11d462e8b4bab1968360a9a85cd83154d /engine/give_pokemon.asm | |
| parent | Use MAX_LEVEL instead of 100/$64 (diff) | |
| download | pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.gz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.tar.xz pokeyellow-53ae0e93fad9f4c3eaef92f102b1eeb531e59d68.zip | |
Use monster struct macros in wram. Rename related labels for consistency.
Diffstat (limited to 'engine/give_pokemon.asm')
| -rwxr-xr-x | engine/give_pokemon.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/give_pokemon.asm b/engine/give_pokemon.asm index 8cd58421..14d75472 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -2,7 +2,7 @@ _GivePokemon: ; 4fda5 (13:7da5) call EnableAutoTextBoxDrawing xor a ld [wccd3], a - ld a, [W_NUMINPARTY] ; W_NUMINPARTY + ld a, [wPartyCount] ; wPartyCount cp $6 jr c, .asm_4fe01 ld a, [W_NUMINBOX] ; wda80 @@ -11,7 +11,7 @@ _GivePokemon: ; 4fda5 (13:7da5) xor a ld [W_ENEMYBATTSTATUS3], a ; W_ENEMYBATTSTATUS3 ld a, [wcf91] - ld [W_ENEMYMONID], a + ld [wEnemyMonSpecies2], a callab Func_3eb01 call SetPokedexOwnedFlag callab Func_e7a4 |