diff options
Diffstat (limited to 'data/maps/Route109')
| -rw-r--r-- | data/maps/Route109/events.inc | 3 | ||||
| -rw-r--r-- | data/maps/Route109/scripts.inc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 322055874..89ee11bb3 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -21,7 +21,7 @@ Route109_EventObjects: @ 8528A34 object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_0x474 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 @@ -39,4 +39,3 @@ Route109_MapBGEvents: @ 8528C7C Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 2e588f813..ebf9398d1 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -272,7 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -328,7 +328,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 @@ -336,7 +336,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 - setflag FLAG_0x118 + setflag FLAG_RECEIVED_SOFT_SAND release end |