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
@@ -138,7 +138,7 @@ Route119_EventScript_DefeatedBrendan:: @ 81F45E4
 	end

 Route119_EventScript_GiveFlyHM:: @ 81F45FF
-	giveitem_std ITEM_HM02
+	giveitem ITEM_HM02
 	setflag FLAG_RECEIVED_HM02
 	return