diff options
| author | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
| commit | 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch) | |
| tree | 4ac69544094baaa620b1e8556ddf79715db4fde3 /data/maps/FallarborTown | |
| parent | 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff) | |
| parent | ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff) | |
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'data/maps/FallarborTown')
| -rw-r--r-- | data/maps/FallarborTown/events.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index fae6f714e..b2246ad5a 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,6 +1,6 @@ FallarborTown_EventObjects: @ 8527BE0 object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 + object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907 |