diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2014-09-19 23:19:05 -0400 |
| commit | dac95cb42bb8bc953c7a1e1d345a549846d51abf (patch) | |
| tree | b996727e4f739da761fc1fa2418c65415ebf93d8 /engine/items | |
| parent | 57113a7651ba8a7f88e119ca3de7acb45a77db69 (diff) | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 830f0dfc..0609e685 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -110,10 +110,10 @@ ItemUseBall: ; d687 (3:5687) dec a jr z,.UseBall ld a,[wPartyCount] ;is Party full? - cp a,6 + cp a,PARTY_LENGTH jr nz,.UseBall ld a,[W_NUMINBOX] ;is Box full? - cp a,20 + cp a,MONS_PER_BOX jp z,BoxFullCannotThrowBall .UseBall ;$56a7 ;ok, you can use a ball @@ -421,7 +421,7 @@ ItemUseBall: ; d687 (3:5687) predef ShowPokedexData .checkParty ;$58f4 ld a,[wPartyCount] - cp a,6 ;is party full? + cp a,PARTY_LENGTH ;is party full? jr z,.sendToBox xor a ld [wcc49],a |