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/RustboroCity_Gym | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/RustboroCity_Gym')
| -rw-r--r-- | data/maps/RustboroCity_Gym/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/RustboroCity_Gym/header.inc | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 193c41685..0d1f57cdd 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,17 +1,17 @@ RustboroCity_Gym_EventObjects: @ 8530538 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, 8, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents: @ 85305C0 - bg_event 2, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057 + bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 + bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 RustboroCity_Gym_MapEvents:: @ 85305D8 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 8aef6fe28..8c07e3637 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,11 +5,11 @@ RustboroCity_Gym: @ 8483398 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM |
