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
@@ -42,7 +42,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
 	msgbox FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale, MSGBOX_DEFAULT
-	takeitem ITEM_HEART_SCALE, 1
+	removeitem ITEM_HEART_SCALE
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
 	end