diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 12:16:52 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 12:16:52 +0200 |
| commit | f35c0abe80ce9ec91618b2237d68463100fa4afa (patch) | |
| tree | 4edd09c2823f967967011d26b39564e4d0f601d8 /data/maps/SingleBattleColosseum | |
| parent | d2e47323fe988e430af782c2c10b8e41e7a131b3 (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
merge with battle tent update
Diffstat (limited to 'data/maps/SingleBattleColosseum')
| -rw-r--r-- | data/maps/SingleBattleColosseum/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/SingleBattleColosseum/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/SingleBattleColosseum/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/SingleBattleColosseum/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/SingleBattleColosseum/scripts.inc | 3 |
5 files changed, 18 insertions, 3 deletions
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/maps/SingleBattleColosseum/border.bin deleted file mode 100644 index 19d906679..000000000 --- a/data/maps/SingleBattleColosseum/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc new file mode 100644 index 000000000..4ef0de89f --- /dev/null +++ b/data/maps/SingleBattleColosseum/events.inc @@ -0,0 +1,14 @@ +SingleBattleColosseum_EventObjects: @ 8539D44 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 + +SingleBattleColosseum_MapWarps: @ 8539D5C + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + +SingleBattleColosseum_MapCoordEvents: @ 8539D6C + coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_08277374 + coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E + +SingleBattleColosseum_MapEvents:: @ 8539D8C + map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 + diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index d5be84526..54d003c27 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,5 +1,5 @@ SingleBattleColosseum: @ 8484D30 - .4byte SingleBattleColosseum_MapAttributes + .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/maps/SingleBattleColosseum/map.bin deleted file mode 100644 index 1f66ab707..000000000 --- a/data/maps/SingleBattleColosseum/map.bin +++ /dev/null @@ -1 +0,0 @@ -hijjjkllmjjjoOpqrrrstturrrwWxyzzz{||}zzz_ଂL2M2솫22M2N2㺻2U2T2U2U2b2c2U2U2V2U222U2`2U2U2d2e2U2U2a2U222U2T2U2U2f2g2U2U2V2U222U2\2]2]2]2]2]2]2^2U22!2!2
\ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc new file mode 100644 index 000000000..06ed3ef16 --- /dev/null +++ b/data/maps/SingleBattleColosseum/scripts.inc @@ -0,0 +1,3 @@ +SingleBattleColosseum_MapScripts:: @ 823B77D + .byte 0 + |