diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/give_pokemon.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
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 02e2b743..33e7b426 100755 --- a/engine/give_pokemon.asm +++ b/engine/give_pokemon.asm @@ -7,12 +7,12 @@ _GivePokemon: ; 4fda5 (13:7da5) ld a, [wPartyCount] cp PARTY_LENGTH jr c, .addToParty - ld a, [W_NUMINBOX] + ld a, [wNumInBox] cp MONS_PER_BOX jr nc, .boxFull ; add to box xor a - ld [W_ENEMYBATTSTATUS3], a + ld [wEnemyBattleStatus3], a ld a, [wcf91] ld [wEnemyMonSpecies2], a callab LoadEnemyMonData |