diff options
| author | yenatch <yenatch@gmail.com> | 2014-08-22 23:17:47 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-08-22 23:17:47 -0700 |
| commit | 365ae68d80683deab0e2e721b8ff79dda4047513 (patch) | |
| tree | bed09a02cacafd88af9f11e354cc17ea5e06784a /engine/battle | |
| parent | cf399a8c86a7340a8c3162400657dca1c5d3ba0a (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/battle')
| -rwxr-xr-x | engine/battle/e.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/e.asm b/engine/battle/e.asm index a0d9d80c..9abeeec8 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -1407,14 +1407,14 @@ SetupEnemyPartyPokeballs: ; 3a887 (e:6887) ld [hl], $20 ld a, $f8 ld [wTrainerEngageDistance], a - ld hl, wOAMBuffer + $18 + ld hl, wOAMBuffer + PARTY_LENGTH * 4 jp Func_3a8e1 SetupPokeballs: ; 0x3a8a6 ld a, [de] push af ld de, wBuffer - ld c, $6 ; max num of partymons + ld c, PARTY_LENGTH ld a, $34 ; empty pokeball .emptyloop ld [de], a @@ -1462,7 +1462,7 @@ PickPokeball: ; 3a8c2 (e:68c2) Func_3a8e1: ; 3a8e1 (e:68e1) ld de, wHPBarMaxHP - ld c, $6 + ld c, PARTY_LENGTH .asm_3a8e6 ld a, [W_BASECOORDY] ; wd082 ld [hli], a |