Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

2020-01-13 20:41:57 -05:00
parent 655910a16f 736f3bbbe0
commit e92cc7752b
118 changed files with 605 additions and 638 deletions
@@ -27,8 +27,8 @@ MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82

 MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
 	msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
-	takeitem ITEM_HARBOR_MAIL, 1
-	giveitem_std ITEM_COIN_CASE
+	removeitem ITEM_HARBOR_MAIL
+	giveitem ITEM_COIN_CASE
 	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_ReceivedCoinCase
 	end