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/BattlePyramidSquare03 | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/BattlePyramidSquare03')
| -rw-r--r-- | data/maps/BattlePyramidSquare03/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare03/header.inc | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 95fdb77bc..1f38240c5 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,11 +1,11 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, 18, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, 17, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, 18, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 3f07295ae..21e15dc82 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -5,11 +5,11 @@ BattlePyramidSquare03: @ 8484F98 .4byte 0x0 .2byte 65535 .2byte 364 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM |