diff options
Diffstat (limited to 'engine/menu/bills_pc.asm')
| -rw-r--r-- | engine/menu/bills_pc.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 072a19d3..d367bdb5 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -212,7 +212,7 @@ BillsPCDeposit: ; 215ac (8:55ac) call PrintText jp BillsPCMenu .partyLargeEnough - ld a, [W_NUMINBOX] + ld a, [wNumInBox] cp MONS_PER_BOX jr nz, .boxNotFull ld hl, BoxFullText @@ -254,7 +254,7 @@ BillsPCDeposit: ; 215ac (8:55ac) jp BillsPCMenu BillsPCWithdraw: ; 21618 (8:5618) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .boxNotEmpty ld hl, NoMonText @@ -268,7 +268,7 @@ BillsPCWithdraw: ; 21618 (8:5618) call PrintText jp BillsPCMenu .partyNotFull - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu call DisplayDepositWithdrawMenu @@ -291,14 +291,14 @@ BillsPCWithdraw: ; 21618 (8:5618) jp BillsPCMenu BillsPCRelease: ; 21673 (8:5673) - ld a, [W_NUMINBOX] + ld a, [wNumInBox] and a jr nz, .loop ld hl, NoMonText call PrintText jp BillsPCMenu .loop - ld hl, W_NUMINBOX + ld hl, wNumInBox call DisplayMonListMenu jp c, BillsPCMenu ld hl, OnceReleasedText @@ -450,7 +450,7 @@ DisplayDepositWithdrawMenu: ; 2174b (8:574b) predef StatusScreen2 call LoadScreenTilesFromBuffer1 call ReloadTilesetTilePatterns - call GoPAL_SET_CF1C + call RunDefaultPaletteCommand call LoadGBPal jr .loop @@ -515,7 +515,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_RIGHT ret nz - ld a, [W_CURMAP] + ld a, [wCurMap] cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .next @@ -532,7 +532,7 @@ CableClubRightGameboy:: ; 5845 (8:5845) ld a, [wSpriteStateData1 + 9] ; player's sprite facing direction cp SPRITE_FACING_LEFT ret nz - ld a, [W_CURMAP] + ld a, [wCurMap] cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .next |