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/SingleBattleColosseum | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/SingleBattleColosseum')
| -rw-r--r-- | data/maps/SingleBattleColosseum/events.inc | 6 | ||||
| -rw-r--r-- | data/maps/SingleBattleColosseum/header.inc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index 4ef0de89f..c0bcde1ba 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,13 +1,13 @@ SingleBattleColosseum_EventObjects: @ 8539D44 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents: @ 8539D6C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E + coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 + coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E SingleBattleColosseum_MapEvents:: @ 8539D8C map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 54d003c27..fe4b69f96 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,11 +5,11 @@ SingleBattleColosseum: @ 8484D30 .4byte 0x0 .2byte MUS_RAINBOW .2byte 221 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_FRONTIER |