Merge master into ObjEvent rename

2019-12-15 02:00:00 -05:00
parent 6556b556dd 6967caefb2
commit 82f55f2381
49 changed files with 1845 additions and 1829 deletions
@@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B

@ Unused, leftover from RS
 MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
-	giveitem_std ITEM_HM08, 1, 1
+	finditem_std ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	end