summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-13 20:41:57 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-13 20:41:57 -0500
commite92cc7752b5934d7501c5027057a6b7c52601bd7 (patch)
tree85150713e1d8561415a54a45221c5b1975c91428 /data/maps/MossdeepCity
parent655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (diff)
parent736f3bbbe0d1685474364a68038554f024bff62e (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
Diffstat (limited to 'data/maps/MossdeepCity')
-rw-r--r--data/maps/MossdeepCity/scripts.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index b0013f72a..fd5c69962 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -229,7 +229,7 @@ MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
compare VAR_RESULT, NO
goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
- giveitem_std ITEM_KINGS_ROCK
+ giveitem ITEM_KINGS_ROCK
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_KINGS_ROCK