diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 08:08:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-14 08:08:51 -0500 |
| commit | bebcea402921d23232f7657fcfdab810f8699399 (patch) | |
| tree | a59ea431d486bf23cde76e35ca789d1a0d113f3e /data/maps/events/BattlePyramidSquare02.inc | |
| parent | f810c9ecade3d793a139f67cd8f63effc5644b99 (diff) | |
| parent | e01dd90bb36f850fe88f2b1edae65c74b3bc48b1 (diff) | |
Merge pull request #263 from huderlem/event_object_movement
Sync event object movement with pokeruby
Diffstat (limited to 'data/maps/events/BattlePyramidSquare02.inc')
| -rw-r--r-- | data/maps/events/BattlePyramidSquare02.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index 790fb67a0..8b14a4a47 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare02_MapObjects: @ 853A51C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare02_EventObjects: @ 853A51C + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 - map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 |