diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-04 11:11:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 11:11:45 -0400 |
| commit | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch) | |
| tree | e8d37347ae000823943ef57973dc34dd98633b40 /data/maps/BattlePyramidSquare06 | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/BattlePyramidSquare06')
| -rw-r--r-- | data/maps/BattlePyramidSquare06/border.bin | bin | 8 -> 0 bytes | |||
| -rw-r--r-- | data/maps/BattlePyramidSquare06/events.inc | 12 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare06/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare06/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare06/scripts.inc | 1 |
5 files changed, 14 insertions, 2 deletions
diff --git a/data/maps/BattlePyramidSquare06/border.bin b/data/maps/BattlePyramidSquare06/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattlePyramidSquare06/border.bin +++ /dev/null diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc new file mode 100644 index 000000000..6ae39b52f --- /dev/null +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -0,0 +1,12 @@ +BattlePyramidSquare06_EventObjects: @ 853A80C + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, 17, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, 16, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, 15, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, 18, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + +BattlePyramidSquare06_MapEvents:: @ 853A8B4 + map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 8d0fa49b1..e99531da8 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare06: @ 8484FEC - .4byte BattlePyramidSquare06_MapAttributes + .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare06/map.bin b/data/maps/BattlePyramidSquare06/map.bin deleted file mode 100644 index c30533aab..000000000 --- a/data/maps/BattlePyramidSquare06/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBaBhjBaBBsBBBBqBBqBBBBBBBBBBBaBBaBBBBsBBqBhjBqBBBBBBBBB
\ No newline at end of file diff --git a/data/maps/BattlePyramidSquare06/scripts.inc b/data/maps/BattlePyramidSquare06/scripts.inc new file mode 100644 index 000000000..6c0d38e41 --- /dev/null +++ b/data/maps/BattlePyramidSquare06/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare06_MapScripts:: @ 823D1A5 |