diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /asm/mystery_event_script.s | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'asm/mystery_event_script.s')
| -rw-r--r-- | asm/mystery_event_script.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index f0e842626..93abd97bc 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -677,13 +677,13 @@ _081266C6: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081266E4 adds r0, r7, 0 mov r1, sp - bl sub_80A2D88 + bl GiveMailToMon2 _081266E4: bl party_compaction bl CalculatePlayerPartyCount |