diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/mail.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/mail.asm')
| -rwxr-xr-x | engine/mail.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/mail.asm b/engine/mail.asm index 840e0a925..392405b20 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -2,7 +2,7 @@ SendMailToPC: ; 4456e ld a, MON_ITEM call GetPartyParamLocation ld d, [hl] - callba ItemIsMail + farcall ItemIsMail jr nc, .full call GetMailboxCount cp MAILBOX_CAPACITY @@ -80,7 +80,7 @@ ReadMailMessage: ; 445f4 call AddNTimes ld d, h ld e, l - callba ReadAnyMail + farcall ReadAnyMail ret MoveMailFromPCToParty: ; 44607 @@ -127,7 +127,7 @@ GetMailboxCount: ; 44648 CheckPokeItem:: ; 44654 push bc push de - callba SelectMonFromParty + farcall SelectMonFromParty ld a, $2 jr c, .pop_return @@ -136,7 +136,7 @@ CheckPokeItem:: ; 44654 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes ld d, [hl] - callba ItemIsMail + farcall ItemIsMail ld a, $3 jr nc, .pop_return @@ -172,12 +172,12 @@ CheckPokeItem:: ; 44654 jr nz, .loop .done - callba CheckCurPartyMonFainted + farcall CheckCurPartyMonFainted ld a, $4 jr c, .close_sram_return xor a ld [wPokemonWithdrawDepositParameter], a - callba RemoveMonFromPartyOrBox + farcall RemoveMonFromPartyOrBox ld a, $1 .close_sram_return @@ -296,7 +296,7 @@ IsAnyMonHoldingMail: ; 44781 ld d, [hl] push hl push de - callba ItemIsMail + farcall ItemIsMail pop de pop hl ret c @@ -503,15 +503,15 @@ MailboxPC: ; 0x44806 ld [PartyMenuActionText], a call ClearBGPalettes .try_again - callba LoadPartyMenuGFX - callba InitPartyMenuWithCancel - callba InitPartyMenuGFX - callba WritePartyMenuTilemap - callba PrintPartyMenuText + farcall LoadPartyMenuGFX + farcall InitPartyMenuWithCancel + farcall InitPartyMenuGFX + farcall WritePartyMenuTilemap + farcall PrintPartyMenuText call WaitBGMap call SetPalettes call DelayFrame - callba PartyMenuSelect + farcall PartyMenuSelect jr c, .exit2 ld a, [CurPartySpecies] cp EGG |