summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-08-22 23:17:47 -0700
committeryenatch <yenatch@gmail.com>2014-08-22 23:17:47 -0700
commit365ae68d80683deab0e2e721b8ff79dda4047513 (patch)
treebed09a02cacafd88af9f11e354cc17ea5e06784a /engine/items
parentcf399a8c86a7340a8c3162400657dca1c5d3ba0a (diff)
Use PARTY_LENGTH and related constants in menu and hud code.
This should allow reducing PARTY_LENGTH to work as intended. Increasing it also works provided space is provided in wram, but breaks pc/saving.
Diffstat (limited to 'engine/items')
-rwxr-xr-xengine/items/items.asm6
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