diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-25 10:56:55 -0500 |
commit | a875d665b812b4aaa5cde21b5127262e04106755 (patch) | |
tree | 4e597cbce3178a5434d62beaf2f812ad57b8b7ef /asm/mystery_event_script.s | |
parent | 293dfc4823d6c984adc221b40be4e3705a3fa65b (diff) | |
parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) |
Merge branch 'master' into easy_chat
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 ce8591981..fbcc5f036 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -727,9 +727,9 @@ _08153D86: beq _08153DA4 adds r0, r7, 0 mov r1, sp - bl sub_80D460C + bl GiveMailToMon2 _08153DA4: - bl party_compaction + bl CompactPartySlots bl CalculatePlayerPartyCount ldr r0, =gStringVar4 ldr r1, =gUnknown_08674BF0 |