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
@@ -28,7 +28,7 @@ RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
 	end

 RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
-	giveitem_std ITEM_TM39
+	giveitem ITEM_TM39
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM39