Merge pull request #953 from GriffinRichards/sync-script

Port some macro/script fixes from pokefirered
2020-01-13 19:33:47 -06:00
parent fa5816915d 96720db083
commit 6d6c57f383
117 changed files with 604 additions and 637 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