diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/Route108 | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/Route108')
| -rw-r--r-- | data/maps/Route108/events.inc | 16 | ||||
| -rw-r--r-- | data/maps/Route108/header.inc | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 0a0b448c4..e18cf16d0 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,17 +1,17 @@ Route108_EventObjects: @ 8528964 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, 13, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, 10, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, 9, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, 1, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, 1139 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents: @ 8528A14 - bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, 86 Route108_MapEvents:: @ 8528A20 map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 2c4cea90d..a6314172f 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,11 +5,11 @@ Route108: @ 848273C .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |