summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePikeThreePathRoom
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
committergarak <garakmon@gmail.com>2018-10-16 14:31:45 -0400
commit0051947414df4656826a5ba0b252fdbb5fb0e065 (patch)
tree4ac69544094baaa620b1e8556ddf79715db4fde3 /data/maps/BattleFrontier_BattlePikeThreePathRoom
parent72f9afcbf4a81909019f21acad0484b72ed217f6 (diff)
parented1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff)
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeThreePathRoom')
-rw-r--r--data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
index dbc3584a6..2fc9e9d6c 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
- object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
- object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
+ object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
+ object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E