summaryrefslogtreecommitdiff
path: root/data/maps/Route119_House
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
commite92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch)
treeb3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/Route119_House
parent156fb472e10c10751268d2339b2526c8bd07e34f (diff)
parent5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff)
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/Route119_House')
-rw-r--r--data/maps/Route119_House/events.inc14
-rw-r--r--data/maps/Route119_House/header.inc8
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
index 05d426fe5..ebae9a0fc 100644
--- a/data/maps/Route119_House/events.inc
+++ b/data/maps/Route119_House/events.inc
@@ -1,11 +1,11 @@
Route119_House_EventObjects: @ 853ECD0
- object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
- object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
- object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
- object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
- object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0
- object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
- object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0
+ object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0
+ object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0
Route119_House_MapWarps: @ 853ED78
warp_def 3, 8, 0, 1, MAP_ROUTE119
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index 754b0c245..e06dc3147 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -5,11 +5,11 @@ Route119_House: @ 8485D28
.4byte 0x0
.2byte MUS_GOTOWN
.2byte 59
- .byte 34
+ .byte MAPSEC_ROUTE_119
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL