diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-17 15:07:17 -0600 |
commit | 52624c4fb7c145c33a2d0edc1d64b2d6e09c1336 (patch) | |
tree | aec3073d480a2fbc3f0221397aa5e84f85755e48 /asm/mystery_event_script.s | |
parent | f8402b3d7408e31a085dc136967f99705c764553 (diff) | |
parent | 3883c399912a35ca4eca3cbee7cb0c46c81e8d76 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald
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 |