diff options
| author | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-16 14:31:45 -0400 |
| commit | 0051947414df4656826a5ba0b252fdbb5fb0e065 (patch) | |
| tree | 4ac69544094baaa620b1e8556ddf79715db4fde3 /data/maps/BattlePyramidSquare04 | |
| parent | 72f9afcbf4a81909019f21acad0484b72ed217f6 (diff) | |
| parent | ed1bb3030bae8b0d00a1fbb68ebd50f6376938ac (diff) | |
Merge remote-tracking branch 'upstream/master' into event-flags
Diffstat (limited to 'data/maps/BattlePyramidSquare04')
| -rw-r--r-- | data/maps/BattlePyramidSquare04/events.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index f44a6e14c..79caf09ff 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,7 +1,7 @@ BattlePyramidSquare04_EventObjects: @ 853A694 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 |