diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/maps/RustboroCity_DevonCorp_3F | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/maps/RustboroCity_DevonCorp_3F')
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/header.inc | 15 | ||||
| -rw-r--r-- | data/maps/RustboroCity_DevonCorp_3F/map.bin | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/maps/RustboroCity_DevonCorp_3F/border.bin new file mode 100644 index 000000000..19d906679 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/border.bin @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc new file mode 100644 index 000000000..4c40570f6 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -0,0 +1,15 @@ +RustboroCity_DevonCorp_3F: @ 848337C + .4byte RustboroCity_DevonCorp_3F_MapAttributes + .4byte RustboroCity_DevonCorp_3F_MapEvents + .4byte RustboroCity_DevonCorp_3F_MapScripts + .4byte 0x0 + .2byte BGM_GOTOWN + .2byte 269 + .byte 10 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 0 + .byte 0 + diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/maps/RustboroCity_DevonCorp_3F/map.bin new file mode 100644 index 000000000..5a55ee4ab --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/map.bin @@ -0,0 +1 @@ +ˆŠ‹Œˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ‰ˆ•–—‘‘IJK‘‘‘‘33333333Q3R3S3333333333€3€3€3€3€€3¸3¹3¹3¹3º3€3€3€3¸3º3€€33Ý2€3€3€3HC€ÀÁÁÁ€3€3€3ÀÂÿB€33å€3€3€3PC€»¼¼¼½€3€3€3»½C€33Ý2€3€3€¨C€ÃÄÄÄÅ€3€3€3ÃÅ©C€3å€3€3€3€€3¾3Æ3Æ3Æ3¿3€3€3€3¾3¿3€€33€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3€3
\ No newline at end of file |