diff options
Diffstat (limited to 'engine/mail.asm')
| -rwxr-xr-x | engine/mail.asm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engine/mail.asm b/engine/mail.asm index 0335a6dfe..c2ecb7548 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -128,7 +128,7 @@ CheckPokeItem:: ; 44654 push bc push de farcall SelectMonFromParty - ld a, $2 + ld a, POKEMAIL_REFUSED jr c, .pop_return ld a, [CurPartyMon] @@ -137,7 +137,7 @@ CheckPokeItem:: ; 44654 call AddNTimes ld d, [hl] farcall ItemIsMail - ld a, $3 + ld a, POKEMAIL_NO_MAIL jr nc, .pop_return ld a, BANK(sPartyMail) @@ -162,7 +162,7 @@ CheckPokeItem:: ; 44654 cp "@" jr z, .done cp c - ld a, $0 + ld a, POKEMAIL_WRONG_MAIL jr nz, .close_sram_return inc hl inc de @@ -173,12 +173,12 @@ CheckPokeItem:: ; 44654 .done farcall CheckCurPartyMonFainted - ld a, $4 + ld a, POKEMAIL_LAST_MON jr c, .close_sram_return xor a ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox - ld a, $1 + ld a, POKEMAIL_CORRECT .close_sram_return call CloseSRAM @@ -559,8 +559,7 @@ MailboxPC: ; 0x44806 .TopMenuDataHeader: ; 0x4494c db %01000000 ; flags - db 1, 8 ; start coords - db 10, 18 ; end coords + menu_coords 8, 1, SCREEN_WIDTH - 2, 10 dw .TopMenuData2 db 1 ; default option @@ -575,8 +574,7 @@ MailboxPC: ; 0x44806 .SubMenuDataHeader: ; 0x44964 db %01000000 ; flags - db 0, 0 ; start coords - db 9, 13 ; end coords + menu_coords 0, 0, 13, 9 dw .SubMenuData2 db 1 ; default option |