summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/012-1/shops.txt2
-rw-r--r--world/map/npc/056-1/flowerpentagram5.txt2
2 files changed, 1 insertions, 3 deletions
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index 67c477e8..e29e33d9 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -26,7 +26,6 @@ L_RoseHat:
"A orange one.", -,
"A blue one.", -;
set @have_id, @base_id + @menu - 1;
- mes "@have_id: " + @have_id;
mes "[Blossom]";
mes "\"And which color would you like?\"";
@@ -38,7 +37,6 @@ L_RoseHat:
"A orange one.", -,
"A blue one.", -;
set @receive_id, @base_id + @menu - 1;
- mes "@receive_id: " + @receive_id;
if (@have_id == @receive_id)
goto L_SameColor;
diff --git a/world/map/npc/056-1/flowerpentagram5.txt b/world/map/npc/056-1/flowerpentagram5.txt
index 4650d426..532bc6eb 100644
--- a/world/map/npc/056-1/flowerpentagram5.txt
+++ b/world/map/npc/056-1/flowerpentagram5.txt
@@ -2,7 +2,7 @@
// $@Flower_Pentagram_Time saves the time when the last summoning happened
056-1.gat,62,31,0|script|#FlowerPentagram5|400,{
-goto L_Place;
+
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest == 30) goto L_FifthFlower;