diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-30 14:43:41 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-30 14:43:41 +0200 |
| commit | 15fe5a031b94b2f9b5686da6ba39a67e92cad31a (patch) | |
| tree | 18658511c9b9cdc73bbcbea5a0be8bdd7407abb5 /data/maps/BattlePyramidSquare11 | |
| parent | 5434db2fc6f4e7ebd8cb6bc76115d5c3b6b5807e (diff) | |
| parent | 91ee3221b3a4885d155ad2cca16b7678062ad18a (diff) | |
Merge branch 'master' into decompile_battle_tent
Diffstat (limited to 'data/maps/BattlePyramidSquare11')
| -rw-r--r-- | data/maps/BattlePyramidSquare11/border.bin | bin | 8 -> 0 bytes | |||
| -rw-r--r-- | data/maps/BattlePyramidSquare11/events.inc | 12 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare11/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare11/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/BattlePyramidSquare11/scripts.inc | 1 |
5 files changed, 14 insertions, 2 deletions
diff --git a/data/maps/BattlePyramidSquare11/border.bin b/data/maps/BattlePyramidSquare11/border.bin Binary files differdeleted file mode 100644 index f496f458e..000000000 --- a/data/maps/BattlePyramidSquare11/border.bin +++ /dev/null diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc new file mode 100644 index 000000000..0389ee141 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -0,0 +1,12 @@ +BattlePyramidSquare11_EventObjects: @ 853ABB8 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 3, 2, 4, 8, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 3, 6, 4, 14, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 6, 4, 4, 8, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 6, 7, 4, 7, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, 1, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 + +BattlePyramidSquare11_MapEvents:: @ 853AC60 + map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 34a53fdee..eac3cb1c7 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,5 +1,5 @@ BattlePyramidSquare11: @ 8485078 - .4byte BattlePyramidSquare11_MapAttributes + .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 diff --git a/data/maps/BattlePyramidSquare11/map.bin b/data/maps/BattlePyramidSquare11/map.bin deleted file mode 100644 index f393f51e5..000000000 --- a/data/maps/BattlePyramidSquare11/map.bin +++ /dev/null @@ -1 +0,0 @@ -BBBBBhjBBB`jBBBBBBsBBaBBhtrBBptbBBBBBqBBaBBBBBhrBBBBBBBBBhjBB
\ No newline at end of file diff --git a/data/maps/BattlePyramidSquare11/scripts.inc b/data/maps/BattlePyramidSquare11/scripts.inc new file mode 100644 index 000000000..3b82fb925 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/scripts.inc @@ -0,0 +1 @@ +BattlePyramidSquare11_MapScripts:: @ 823D1A5 |