diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/menu/bills_pc.asm | |
| parent | Use more *Coord (diff) | |
| parent | named town map stuff (diff) | |
| download | pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.gz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.xz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'engine/menu/bills_pc.asm')
| -rw-r--r-- | engine/menu/bills_pc.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index b42a34f0..fcc51af1 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -229,11 +229,11 @@ BillsPCDeposit: ld a, [wcf91] call GetCryData call PlaySoundWaitForCurrent - ld a, $1 - ld [wcf95], a - call Func_3a68 + ld a, PARTY_TO_BOX + ld [wMoveMonType], a + call MoveMon xor a - ld [wcf95], a + ld [wRemoveMonFromBox], a call RemovePokemon call WaitForSoundToFinish ld hl, wWhichTrade @@ -281,11 +281,11 @@ Func_21618: ; 21618 (8:5618) ld a, [wcf91] call GetCryData call PlaySoundWaitForCurrent - xor a - ld [wcf95], a - call Func_3a68 - ld a, $1 - ld [wcf95], a + xor a ; BOX_TO_PARTY + ld [wMoveMonType], a + call MoveMon + ld a, 1 + ld [wRemoveMonFromBox], a call RemovePokemon call WaitForSoundToFinish ld hl, MonIsTakenOutText @@ -310,7 +310,7 @@ Func_21673: ; 21673 (8:5673) and a jr nz, .asm_21682 inc a - ld [wcf95], a + ld [wRemoveMonFromBox], a call RemovePokemon call WaitForSoundToFinish ld a, [wcf91] @@ -329,7 +329,7 @@ Func_216be: ; 216be (8:56be) ld a, h ld [wList + 1], a xor a - ld [wcf93], a + ld [wPrintItemPrices], a ld [wListMenuID], a inc a ; MONSTER_NAME ld [wNameListType], a |