aboutsummaryrefslogtreecommitdiffstats
path: root/engine/pokemon/bills_pc.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-04-30 14:03:34 -0500
committerdannye <33dannye@gmail.com>2021-04-30 14:03:34 -0500
commit0cbd5acb76d0f5df35ebf529bd227c201e0b3115 (patch)
treefcc3124631cbbc05d3f4df670d13e5f2a3e02e59 /engine/pokemon/bills_pc.asm
parentpokered -> pokeyellow (diff)
parentUse {interpolation} to generate sequences of RAM labels (diff)
downloadpokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.tar.gz
pokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.tar.xz
pokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pokemon/bills_pc.asm')
-rw-r--r--engine/pokemon/bills_pc.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 42d4fb07..13ad1b20 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -215,7 +215,7 @@ BillsPCDeposit:
call PrintText
jp BillsPCMenu
.partyLargeEnough
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
cp MONS_PER_BOX
jr nz, .boxNotFull
ld hl, BoxFullText
@@ -276,7 +276,7 @@ SleepingPikachuText2:
text_end
BillsPCWithdraw:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
and a
jr nz, .boxNotEmpty
ld hl, NoMonText
@@ -290,7 +290,7 @@ BillsPCWithdraw:
call PrintText
jp BillsPCMenu
.partyNotFull
- ld hl, wNumInBox
+ ld hl, wBoxCount
call DisplayMonListMenu
jp c, BillsPCMenu
call DisplayDepositWithdrawMenu
@@ -319,14 +319,14 @@ BillsPCWithdraw:
jp BillsPCMenu
BillsPCRelease:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
and a
jr nz, .loop
ld hl, NoMonText
call PrintText
jp BillsPCMenu
.loop
- ld hl, wNumInBox
+ ld hl, wBoxCount
call DisplayMonListMenu
jp c, BillsPCMenu
callfar IsThisPartymonStarterPikachu_Box