diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/billspc.asm | 12 | ||||
| -rwxr-xr-x | engine/events/special.asm | 2 | ||||
| -rwxr-xr-x | engine/link.asm | 2 | ||||
| -rwxr-xr-x | engine/mail.asm | 2 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 4 | ||||
| -rwxr-xr-x | engine/npctrade.asm | 4 |
6 files changed, 13 insertions, 13 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 diff --git a/engine/events/special.asm b/engine/events/special.asm index 081606512..e23aaae8c 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -118,7 +118,7 @@ Special_ReturnShuckle: ; 737e cp 150 ld a, SHUCKIE_HAPPY jr nc, .HappyToStayWithYou - xor a ; take from pc + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox ld a, SHUCKIE_RETURNED diff --git a/engine/link.asm b/engine/link.asm index 4c22e18ea..238ccb7f7 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1863,7 +1863,7 @@ LinkTrade: ; 28b87 add hl, bc ld a, [hl] ld [wd002], a - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a callfar RemoveMonFromPartyOrBox ld a, [wPartyCount] diff --git a/engine/mail.asm b/engine/mail.asm index c1a2db5aa..a8e9bd2c5 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -175,7 +175,7 @@ CheckPokeItem:: ; 44654 farcall CheckCurPartyMonFainted ld a, POKEMAIL_LAST_MON jr c, .close_sram_return - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox ld a, POKEMAIL_CORRECT diff --git a/engine/move_mon.asm b/engine/move_mon.asm index a3600d2f0..0a4465f97 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -918,7 +918,7 @@ GetLastPartyMon: ; de1a DepositMonWithDayCareMan: ; de2a ld de, wBreedMon1Nick call DepositBreedmon - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a jp RemoveMonFromPartyOrBox ; de37 @@ -926,7 +926,7 @@ DepositMonWithDayCareMan: ; de2a DepositMonWithDayCareLady: ; de37 ld de, wBreedMon2Nick call DepositBreedmon - xor a + xor a ; REMOVE_PARTY ld [wPokemonWithdrawDepositParameter], a jp RemoveMonFromPartyOrBox ; de44 diff --git a/engine/npctrade.asm b/engine/npctrade.asm index 7082d5442..49f7123e1 100755 --- a/engine/npctrade.asm +++ b/engine/npctrade.asm @@ -185,8 +185,8 @@ DoNPCTrade: ; fcc63 ld a, [wOTTrademonSpecies] ld [wCurPartySpecies], a xor a - ld [wMonType], a - ld [wPokemonWithdrawDepositParameter], a + ld [wMonType], a ; PARTYMON + ld [wPokemonWithdrawDepositParameter], a ; REMOVE_PARTY callfar RemoveMonFromPartyOrBox predef TryAddMonToParty |