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/RecordCorner | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/RecordCorner')
| -rw-r--r-- | data/maps/RecordCorner/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/RecordCorner/header.inc | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 7970c14ba..8e1916a5a 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects: @ 8539DFC - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, MAP_NONE @@ -8,10 +8,10 @@ RecordCorner_MapWarps: @ 8539E14 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents: @ 8539E34 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827741D - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277447 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277432 - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C + coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D + coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 + coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 + coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C RecordCorner_MapEvents:: @ 8539E74 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index 7235504fa..9029f306f 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,11 +5,11 @@ RecordCorner: @ 8484D68 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL |