summaryrefslogtreecommitdiff
path: root/data/maps/Route128
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-10-17 20:03:31 -0400
committergolem galvanize <golemgalvanize@github.com>2018-10-17 20:03:31 -0400
commit2c6d634acdf7bd22fb7e5c4933ff2e13712d2ec3 (patch)
tree9d51a6c1c07da6946022fe5867e34300bd71493d /data/maps/Route128
parent65a0c48eec7d2184478841d232d1fb3c3350fa37 (diff)
parentf67bbbdaaa905833f1c2a315624128aafef9a4cb (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'data/maps/Route128')
-rw-r--r--data/maps/Route128/events.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
index 02d28acfd..5c0b82cee 100644
--- a/data/maps/Route128/events.inc
+++ b/data/maps/Route128/events.inc
@@ -5,8 +5,8 @@ Route128_EventObjects: @ 852C88C
object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 944
object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 945
object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0
- object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
- object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
+ object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0
+ object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0
object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0
object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0