diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-13 20:41:57 -0500 |
| commit | e92cc7752b5934d7501c5027057a6b7c52601bd7 (patch) | |
| tree | 85150713e1d8561415a54a45221c5b1975c91428 /data/maps/Route104/scripts.inc | |
| parent | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff) | |
| parent | 736f3bbbe0d1685474364a68038554f024bff62e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'data/maps/Route104/scripts.inc')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 4ddba42f6..e7e698be6 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -269,7 +269,7 @@ Route104_EventScript_ExpertF:: @ 81ECF8C faceplayer goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_CHESTO_BERRY + giveitem ITEM_CHESTO_BERRY compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 @@ -287,7 +287,7 @@ Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD faceplayer goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT - giveitem_std ITEM_WHITE_HERB + giveitem ITEM_WHITE_HERB compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB @@ -340,7 +340,7 @@ Route104_EventScript_Boy2:: @ 81ED057 faceplayer goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT - giveitem_std ITEM_TM09 + giveitem ITEM_TM09 compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 |