diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-20 23:03:05 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-20 23:03:05 -0700 |
| commit | a129ba7b43b743efacf2926f4443b5f1d6305ef8 (patch) | |
| tree | 2f89c70ca0ed96be57b90801979246585930ae16 /items | |
| parent | a0aadb33e7341dd69ba0c5c9da5d733f2e84a24a (diff) | |
Nail down the rest of SRAM banks 0 and 1.
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 599ecc6bb..8c574da88 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -216,10 +216,10 @@ ParkBall: ; e8a2 cp PARTY_LENGTH jr nz, .asm_e8c0 - ld a, $1 + ld a, BANK(sBoxCount) call GetSRAMBank - ld a, [$ad10] - cp 20 + ld a, [sBoxCount] + cp MONS_PER_BOX call CloseSRAM jp z, Ball_BoxIsFullMessage @@ -622,22 +622,21 @@ endr callba Function4db83 - ld a, $1 + ld a, BANK(sBoxCount) call GetSRAMBank - ld a, [$ad10] + ld a, [sBoxCount] cp MONS_PER_BOX jr nz, .asm_eb5b ld hl, wd0ee set 7, [hl] - .asm_eb5b ld a, [CurItem] cp FRIEND_BALL jr nz, .asm_eb67 + ; Bug: overwrites the happiness of the first mon in the box! ld a, FRIEND_BALL_HAPPINESS - ld [$ad41], a - + ld [sBoxMon1Happiness], a .asm_eb67 call CloseSRAM |