summaryrefslogtreecommitdiff
path: root/engine/billspc.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-02-22 21:35:11 +0100
committermid-kid <esteve.varela@gmail.com>2018-02-22 21:36:14 +0100
commit3d34f5a5a371ad2b9979ae36763cdfb52c581dab (patch)
treea4039e1486138bfc4f84d2e6c8b9119b7677e1d1 /engine/billspc.asm
parenta22343d32c9f81b9cd2a4f2ff49725cfbed6671d (diff)
Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox
It takes a clearly different parameter, completely unrelated and different in function to PC_DEPOSIT and PC_WITHDRAW.
Diffstat (limited to 'engine/billspc.asm')
-rwxr-xr-xengine/billspc.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 639db4205..42a761634 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -203,7 +203,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
ld hl, wBillsPC_ScrollPosition
add [hl]
ld [wCurPartyMon], a
- xor a
+ xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN
@@ -463,7 +463,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
ld hl, wBillsPC_ScrollPosition
add [hl]
ld [wCurPartyMon], a
- ld a, PC_DEPOSIT
+ ld a, REMOVE_BOX
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
call ReleasePKMN_ByePKMN
@@ -1821,7 +1821,7 @@ DepositPokemon: ; e307c (38:707c)
ld [wPokemonWithdrawDepositParameter], a
predef SendGetMonIntoFromBox
jr c, .asm_boxisfull
- xor a
+ xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ld a, [wCurPartySpecies]
@@ -1876,7 +1876,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
ld [wPokemonWithdrawDepositParameter], a
predef SendGetMonIntoFromBox
jr c, .PartyFull
- ld a, PC_DEPOSIT
+ ld a, REMOVE_BOX
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ld a, [wCurPartySpecies]
@@ -2113,7 +2113,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
call CopyMonToTemp
call CloseSRAM
farcall CalcBufferMonStats
- ld a, PC_DEPOSIT
+ ld a, REMOVE_BOX
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ret
@@ -2146,7 +2146,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
call CopyMonToTemp
- xor a
+ xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ret