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
@@ -15,13 +15,13 @@ DesertUnderpass_EventScript_Fossil:: @ 823AF41
 	end

 DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
-	giveitem_std ITEM_CLAW_FOSSIL
+	giveitem ITEM_CLAW_FOSSIL
 	removeobject 1
 	release
 	end

 DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
-	giveitem_std ITEM_ROOT_FOSSIL
+	giveitem ITEM_ROOT_FOSSIL
 	removeobject 1
 	release
 	end