Merge branch 'master' of https://github.com/pret/pokeemerald

2017-11-19 10:50:39 +00:00
parent 370e47beee 5dc8beb034
commit 625be4bf04
59 changed files with 4683 additions and 7633 deletions
@@ -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, =gText_MysteryGiftSentOver