diff options
Diffstat (limited to 'engine/mail.asm')
| -rwxr-xr-x | engine/mail.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/mail.asm b/engine/mail.asm index 82d27d4be..4c0af5f9b 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -177,7 +177,7 @@ CheckPokeItem:: ; 44654 jr c, .close_sram_return xor a ld [wPokemonWithdrawDepositParameter], a - callba Functione039 + callba RemoveMonFromPartyOrBox ld a, $1 .close_sram_return @@ -399,13 +399,13 @@ MailboxPC: ; 0x44806 ld [wMenuCursorBuffer], a ld a, [OBPals + 8 * 6] ld [wMenuScrollPosition], a - call HandleScrollingMenu + call ScrollingMenu ld a, [wMenuScrollPosition] ld [OBPals + 8 * 6], a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld [wCurMessageIndex], a - ld a, [wcf73] + ld a, [wMenuJoypad] cp $2 jr z, .exit call Function4484a @@ -419,10 +419,10 @@ MailboxPC: ; 0x44806 Function4484a: ; 0x4484a ld hl, MenuData44964 call LoadMenuDataHeader - call InterpretMenu2 + call VerticalMenu call ExitMenu jr c, .exit - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a ld hl, .JumpTable rst JumpTable @@ -443,7 +443,7 @@ Function4484a: ; 0x4484a dec a ld b, a call ReadMailMessage - jp ReturnToCallingMenu + jp CloseSubmenu ; 0x44877 .PutInPack ; 0x44877 @@ -539,7 +539,7 @@ Function4484a: ; 0x4484a call PrintText .exit2 - jp ReturnToCallingMenu + jp CloseSubmenu ; 0x4493c .HoldingMailText ; 0x4493c |